diff --git a/Sources/PrivateInformationRetrieval/IndexPirProtocol.swift b/Sources/PrivateInformationRetrieval/IndexPir/IndexPirProtocol.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/IndexPirProtocol.swift
rename to Sources/PrivateInformationRetrieval/IndexPir/IndexPirProtocol.swift
diff --git a/Sources/PrivateInformationRetrieval/MulPir.swift b/Sources/PrivateInformationRetrieval/IndexPir/MulPir.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/MulPir.swift
rename to Sources/PrivateInformationRetrieval/IndexPir/MulPir.swift
diff --git a/Sources/PrivateInformationRetrieval/PirUtil.swift b/Sources/PrivateInformationRetrieval/IndexPir/PirUtil.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/PirUtil.swift
rename to Sources/PrivateInformationRetrieval/IndexPir/PirUtil.swift
diff --git a/Sources/PrivateInformationRetrieval/CuckooTable.swift b/Sources/PrivateInformationRetrieval/KeywordPir/CuckooTable.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/CuckooTable.swift
rename to Sources/PrivateInformationRetrieval/KeywordPir/CuckooTable.swift
diff --git a/Sources/PrivateInformationRetrieval/HashBucket.swift b/Sources/PrivateInformationRetrieval/KeywordPir/HashBucket.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/HashBucket.swift
rename to Sources/PrivateInformationRetrieval/KeywordPir/HashBucket.swift
diff --git a/Sources/PrivateInformationRetrieval/KeywordDatabase.swift b/Sources/PrivateInformationRetrieval/KeywordPir/KeywordDatabase.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/KeywordDatabase.swift
rename to Sources/PrivateInformationRetrieval/KeywordPir/KeywordDatabase.swift
diff --git a/Sources/PrivateInformationRetrieval/KeywordPirProtocol.swift b/Sources/PrivateInformationRetrieval/KeywordPir/KeywordPirProtocol.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/KeywordPirProtocol.swift
rename to Sources/PrivateInformationRetrieval/KeywordPir/KeywordPirProtocol.swift
diff --git a/Sources/PrivateInformationRetrieval/SymmetricPirDatabase.swift b/Sources/PrivateInformationRetrieval/SymmetricPir/SymmetricPirDatabase.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/SymmetricPirDatabase.swift
rename to Sources/PrivateInformationRetrieval/SymmetricPir/SymmetricPirDatabase.swift
diff --git a/Sources/PrivateInformationRetrieval/SymmetricPIRProtocol.swift b/Sources/PrivateInformationRetrieval/SymmetricPir/SymmetricPirProtocol.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/SymmetricPIRProtocol.swift
rename to Sources/PrivateInformationRetrieval/SymmetricPir/SymmetricPirProtocol.swift
diff --git a/Sources/PrivateInformationRetrieval/Error.swift b/Sources/PrivateInformationRetrieval/Util/Error.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/Error.swift
rename to Sources/PrivateInformationRetrieval/Util/Error.swift
diff --git a/Sources/PrivateInformationRetrieval/Util.swift b/Sources/PrivateInformationRetrieval/Util/Util.swift
similarity index 100%
rename from Sources/PrivateInformationRetrieval/Util.swift
rename to Sources/PrivateInformationRetrieval/Util/Util.swift
diff --git a/swift-homomorphic-encryption-protobuf b/swift-homomorphic-encryption-protobuf
index 37fe401b..67158642 160000
--- a/swift-homomorphic-encryption-protobuf
+++ b/swift-homomorphic-encryption-protobuf
@@ -1 +1 @@
-Subproject commit 37fe401bbbf92f0317b768b6338cc35d29743119
+Subproject commit 6715864271bd7943e31a7107b55b97dd34c5ee6b