diff --git a/lbrynet/schema/Makefile b/lbrynet/schema/Makefile
index a133af7f4..d582f407f 100644
--- a/lbrynet/schema/Makefile
+++ b/lbrynet/schema/Makefile
@@ -1,9 +1,6 @@
 build:
-	rm proto2/* proto3/* -rf
-	cd proto2 && protoc --python_out=. -I ../../../../types/v1/proto/ ../../../../types/v1/proto/*.proto
-	sed -e 's/^import\ \(.*\)_pb2\ /from . import\ \1_pb2\ /g' -i proto2/*.py
-	touch proto2/__init__.py
-	cd proto3 && protoc --python_out=. -I ../../../../types/v2/proto/ ../../../../types/v2/proto/*.proto
-	sed -e 's/^import\ \(.*\)_pb2\ /from . import\ \1_pb2\ /g' -i proto3/*.py
-	touch proto3/__init__.py
-
+	rm types/v1/* types/v2/* -rf
+	touch types/v1/__init__.py types/v2/__init__.py
+	cd types/v1/ && protoc --python_out=. -I ../../../../../types/v1/proto/ ../../../../../types/v1/proto/*.proto
+	sed -e 's/^import\ \(.*\)_pb2\ /from . import\ \1_pb2\ /g' -i types/v1/*.py
+	cd types/v2/ && protoc --python_out=. -I ../../../../../types/v2/proto/ ../../../../../types/v2/proto/*.proto
diff --git a/lbrynet/schema/proto2/__init__.py b/lbrynet/schema/types/v1/__init__.py
similarity index 100%
rename from lbrynet/schema/proto2/__init__.py
rename to lbrynet/schema/types/v1/__init__.py
diff --git a/lbrynet/schema/proto2/certificate_pb2.py b/lbrynet/schema/types/v1/certificate_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/certificate_pb2.py
rename to lbrynet/schema/types/v1/certificate_pb2.py
diff --git a/lbrynet/schema/proto2/fee_pb2.py b/lbrynet/schema/types/v1/fee_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/fee_pb2.py
rename to lbrynet/schema/types/v1/fee_pb2.py
diff --git a/lbrynet/schema/proto2/legacy_claim_pb2.py b/lbrynet/schema/types/v1/legacy_claim_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/legacy_claim_pb2.py
rename to lbrynet/schema/types/v1/legacy_claim_pb2.py
diff --git a/lbrynet/schema/proto2/metadata_pb2.py b/lbrynet/schema/types/v1/metadata_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/metadata_pb2.py
rename to lbrynet/schema/types/v1/metadata_pb2.py
diff --git a/lbrynet/schema/proto2/signature_pb2.py b/lbrynet/schema/types/v1/signature_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/signature_pb2.py
rename to lbrynet/schema/types/v1/signature_pb2.py
diff --git a/lbrynet/schema/proto2/source_pb2.py b/lbrynet/schema/types/v1/source_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/source_pb2.py
rename to lbrynet/schema/types/v1/source_pb2.py
diff --git a/lbrynet/schema/proto2/stream_pb2.py b/lbrynet/schema/types/v1/stream_pb2.py
similarity index 100%
rename from lbrynet/schema/proto2/stream_pb2.py
rename to lbrynet/schema/types/v1/stream_pb2.py
diff --git a/lbrynet/schema/proto3/__init__.py b/lbrynet/schema/types/v2/__init__.py
similarity index 100%
rename from lbrynet/schema/proto3/__init__.py
rename to lbrynet/schema/types/v2/__init__.py
diff --git a/lbrynet/schema/proto3/claim_pb2.py b/lbrynet/schema/types/v2/claim_pb2.py
similarity index 100%
rename from lbrynet/schema/proto3/claim_pb2.py
rename to lbrynet/schema/types/v2/claim_pb2.py