diff --git a/.gitignore b/schema/.gitignore
similarity index 100%
rename from .gitignore
rename to schema/.gitignore
diff --git a/.travis.yml b/schema/.travis.yml
similarity index 100%
rename from .travis.yml
rename to schema/.travis.yml
diff --git a/address/address_test.go b/schema/address/address_test.go
similarity index 100%
rename from address/address_test.go
rename to schema/address/address_test.go
diff --git a/address/base58/base58_test.go b/schema/address/base58/base58_test.go
similarity index 100%
rename from address/base58/base58_test.go
rename to schema/address/base58/base58_test.go
diff --git a/address/base58/character.go b/schema/address/base58/character.go
similarity index 100%
rename from address/base58/character.go
rename to schema/address/base58/character.go
diff --git a/address/base58/checksum.go b/schema/address/base58/checksum.go
similarity index 100%
rename from address/base58/checksum.go
rename to schema/address/base58/checksum.go
diff --git a/address/base58/decode.go b/schema/address/base58/decode.go
similarity index 100%
rename from address/base58/decode.go
rename to schema/address/base58/decode.go
diff --git a/address/base58/encode.go b/schema/address/base58/encode.go
similarity index 100%
rename from address/base58/encode.go
rename to schema/address/base58/encode.go
diff --git a/address/decode.go b/schema/address/decode.go
similarity index 100%
rename from address/decode.go
rename to schema/address/decode.go
diff --git a/address/encode.go b/schema/address/encode.go
similarity index 100%
rename from address/encode.go
rename to schema/address/encode.go
diff --git a/address/validate.go b/schema/address/validate.go
similarity index 100%
rename from address/validate.go
rename to schema/address/validate.go
diff --git a/build.sh b/schema/build.sh
similarity index 100%
rename from build.sh
rename to schema/build.sh
diff --git a/build_and_test.sh b/schema/build_and_test.sh
similarity index 100%
rename from build_and_test.sh
rename to schema/build_and_test.sh
diff --git a/claim/claim.go b/schema/claim/claim.go
similarity index 100%
rename from claim/claim.go
rename to schema/claim/claim.go
diff --git a/claim/claim_test.go b/schema/claim/claim_test.go
similarity index 100%
rename from claim/claim_test.go
rename to schema/claim/claim_test.go
diff --git a/claim/decode_test.go b/schema/claim/decode_test.go
similarity index 100%
rename from claim/decode_test.go
rename to schema/claim/decode_test.go
diff --git a/claim/keys.go b/schema/claim/keys.go
similarity index 100%
rename from claim/keys.go
rename to schema/claim/keys.go
diff --git a/claim/keys_test.go b/schema/claim/keys_test.go
similarity index 100%
rename from claim/keys_test.go
rename to schema/claim/keys_test.go
diff --git a/claim/migration.go b/schema/claim/migration.go
similarity index 100%
rename from claim/migration.go
rename to schema/claim/migration.go
diff --git a/claim/migration_test.go b/schema/claim/migration_test.go
similarity index 100%
rename from claim/migration_test.go
rename to schema/claim/migration_test.go
diff --git a/claim/pretty.go b/schema/claim/pretty.go
similarity index 100%
rename from claim/pretty.go
rename to schema/claim/pretty.go
diff --git a/claim/schema.go b/schema/claim/schema.go
similarity index 100%
rename from claim/schema.go
rename to schema/claim/schema.go
diff --git a/claim/serialization.go b/schema/claim/serialization.go
similarity index 100%
rename from claim/serialization.go
rename to schema/claim/serialization.go
diff --git a/claim/sign.go b/schema/claim/sign.go
similarity index 100%
rename from claim/sign.go
rename to schema/claim/sign.go
diff --git a/claim/sign_test.go b/schema/claim/sign_test.go
similarity index 100%
rename from claim/sign_test.go
rename to schema/claim/sign_test.go
diff --git a/claim/validator.go b/schema/claim/validator.go
similarity index 100%
rename from claim/validator.go
rename to schema/claim/validator.go
diff --git a/claim/validator_test.go b/schema/claim/validator_test.go
similarity index 100%
rename from claim/validator_test.go
rename to schema/claim/validator_test.go
diff --git a/cli/lbryschema-cli.go b/schema/cli/lbryschema-cli.go
similarity index 100%
rename from cli/lbryschema-cli.go
rename to schema/cli/lbryschema-cli.go
diff --git a/test.sh b/schema/test.sh
similarity index 100%
rename from test.sh
rename to schema/test.sh