diff --git a/sample-project.yaml b/sample-project.yaml
index 0e58479f..caa7315b 100644
--- a/sample-project.yaml
+++ b/sample-project.yaml
@@ -31,11 +31,11 @@ links:
   twitter: https://twitter.com/sample_privacy_project
   
 # Details on live status + version
-project_status:
-  live_status: true
-  version: Mainnet
-  testnet: false
-  mainnet: true
+# project_status:
+#   live_status: true
+#   version: Mainnet
+#   testnet: false
+#   mainnet: true
 
 # Token ticker + contract address - if there is no token "have_token: false" 
 have_token: true
@@ -64,18 +64,18 @@ history:
   link: https://infonewspage.com/sample-launch
 
 # more links
-links:
-  block_explorer: https://samplescan.io/
-  forum: https://forum.sample-website.com
-  changelog: https://changelog.sample-website.com
-  snapshot: https://snapshot.org/sample-dao
-  discord: https://discord.com/invite/jgUQSAMPLE
-  facebook: https://facebook.com/sample-privacy-crypto
-  telegram: https://t.me/sample_privacy_project
-  lens: https://hey.xyz/u/sample_privacy_project
-  farcaster: "@sampleprivacyproject"
-  rss_feed: https://rss-feeds.com/sample_privacy_project
-  education: https://twitter.com/random_user/status/12345678901234
+# links:
+#   block_explorer: https://samplescan.io/
+#   forum: https://forum.sample-website.com
+#   changelog: https://changelog.sample-website.com
+#   snapshot: https://snapshot.org/sample-dao
+#   discord: https://discord.com/invite/jgUQSAMPLE
+#   facebook: https://facebook.com/sample-privacy-crypto
+#   telegram: https://t.me/sample_privacy_project
+#   lens: https://hey.xyz/u/sample_privacy_project
+#   farcaster: "@sampleprivacyproject"
+#   rss_feed: https://rss-feeds.com/sample_privacy_project
+#   education: https://twitter.com/random_user/status/12345678901234
   
 # TECHNOLOGY - information -------------------------------------------------------------------------------------------------------------
 # Please have a look at https://github.com/web3privacy/explorer-data for explanations + examples
diff --git a/schema/asset_custody_type.yaml b/schema/custody.yaml
similarity index 100%
rename from schema/asset_custody_type.yaml
rename to schema/custody.yaml
diff --git a/schema/project_phase.yaml b/schema/phase.yaml
similarity index 100%
rename from schema/project_phase.yaml
rename to schema/phase.yaml
diff --git a/schema/sign_in_type_requirments.yaml b/schema/requirement.yaml
similarity index 100%
rename from schema/sign_in_type_requirments.yaml
rename to schema/requirement.yaml
diff --git a/src/asset_custody_type.yaml b/src/asset_custody_type.yaml
deleted file mode 100644
index 2e9adb6f..00000000
--- a/src/asset_custody_type.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-  - id: non-custody
-    name: Non-custody
diff --git a/src/custodys.yaml b/src/custodys.yaml
new file mode 100644
index 00000000..1ca3aec0
--- /dev/null
+++ b/src/custodys.yaml
@@ -0,0 +1,4 @@
+- id: non-custody
+  name: Non-custody
+- id: custodial
+  name: Custodial
diff --git a/src/phases.yaml b/src/phases.yaml
new file mode 100644
index 00000000..e77de7b2
--- /dev/null
+++ b/src/phases.yaml
@@ -0,0 +1,10 @@
+- id: mainnet
+  name: Mainnet
+- id: testnet
+  name: Testnet
+- id: alpha
+  name: Alpha
+- id: beta
+  name: Beta
+- id: mvp
+  name: MVP
diff --git a/src/project_phase.yaml b/src/project_phase.yaml
deleted file mode 100644
index 232738ad..00000000
--- a/src/project_phase.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-  - id: mainnet
-    name: Mainnet
-  - id: testnet
-    name: Testnet
-  - id: alpha
-    name: Alpha
-  - id: beta
-    name: Beta
-  - id: mvp
-    name: MVP
diff --git a/src/requirements.yaml b/src/requirements.yaml
new file mode 100644
index 00000000..20cf5bea
--- /dev/null
+++ b/src/requirements.yaml
@@ -0,0 +1,6 @@
+- id: wallet
+  name: Wallet
+- id: email
+  name: Email
+- id: seed
+  name: Seed
diff --git a/src/sign_in_type_requirments.yaml b/src/sign_in_type_requirments.yaml
deleted file mode 100644
index e9277760..00000000
--- a/src/sign_in_type_requirments.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-  - id: wallet
-    name: Wallet
-  - id: email
-    name: Email
-  - id: seed
-    name: Seed
diff --git a/utils/test.js b/utils/test.js
index 3b22c99e..e644008c 100644
--- a/utils/test.js
+++ b/utils/test.js
@@ -50,6 +50,9 @@ const matrix = {
   features: "feature",
   usecases: "usecase",
   ranks: "rank",
+  custodys: "custody",
+  phases: "phase",
+  requirements: "requirement"
 };
 
 const schemaDir = "./schema";