diff --git a/README.md b/README.md
index cd790f57..895d4563 100644
--- a/README.md
+++ b/README.md
@@ -73,9 +73,6 @@ Also, do not forget to include `use_frameworks!` line in your Podfile.
 
 To complete installation, run `pod install`.
 
-_Note:_ Actually, there is one more subspec (SWCompression/Common) but it does not contain any end-user functions.
-It is included in every other subspec and should not be specified directly in Podfile.
-
 ##### Carthage
 Add to  your Cartfile `github "tsolomko/SWCompression"`.
 
diff --git a/SWCompression.podspec b/SWCompression.podspec
index 95985e75..7b0776d6 100644
--- a/SWCompression.podspec
+++ b/SWCompression.podspec
@@ -27,56 +27,44 @@ Pod::Spec.new do |s|
 
   # This is subspec for internal use by other subspecs.
   # It should not be included directly in Podfile.
-  s.subspec 'Common' do |sp|
-    sp.public_header_files = 'Sources/Service/SWCompression.h'
-    sp.source_files  = "Sources/{CheckSums.swift,DataWithPointer.swift,Extensions.swift,Protocols.swift,Service/*.swift,Service/*.h}"
-  end
 
   s.subspec 'Deflate' do |sp|
-    sp.dependency 'SWCompression/Common'
-    sp.source_files = 'Sources/{Deflate.swift,HuffmanTree.swift,BitToByteWriter.swift}'
+    sp.source_files = 'Sources/{Deflate,DeflateCompression,DeflateError,Extensions,Protocols,DataWithPointer,BitReader,HuffmanTree,BitWriter}.swift'
   end
 
   s.subspec 'GZip' do |sp|
-    sp.dependency 'SWCompression/Common'
     sp.dependency 'SWCompression/Deflate'
     sp.source_files = 'Sources/{GzipArchive,GzipHeader,GzipError}.swift'
   end
 
   s.subspec 'Zlib' do |sp|
-    sp.dependency 'SWCompression/Common'
     sp.dependency 'SWCompression/Deflate'
     sp.source_files = 'Sources/{ZlibArchive,ZlibHeader,ZlibError}.swift'
   end
 
   s.subspec 'BZip2' do |sp|
-    sp.dependency 'SWCompression/Common'
-    sp.source_files = 'Sources/{BZip2.swift,HuffmanTree.swift,BitToByteWriter.swift}'
+    sp.source_files = 'Sources/{BZip2,BZip2Error,Extensions,Protocols,DataWithPointer,BitReader,HuffmanTree}.swift'
     sp.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DSWCOMP_ZIP_POD_BZ2' }
   end
 
   s.subspec 'LZMA' do |sp|
-    sp.dependency 'SWCompression/Common'
-    sp.source_files = 'Sources/LZMA*.swift'
+    sp.source_files = 'Sources/{LZMA*,Extensions,Protocols,DataWithPointer}.swift'
     sp.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DSWCOMP_ZIP_POD_LZMA' }
   end
 
   s.subspec 'XZ' do |sp|
-    sp.dependency 'SWCompression/Common'
     sp.dependency 'SWCompression/LZMA'
     sp.source_files = 'Sources/{XZArchive,XZError}.swift'
   end
 
   s.subspec 'ZIP' do |sp|
-    sp.dependency 'SWCompression/Common'
     sp.dependency 'SWCompression/Deflate'
-    sp.source_files = 'Sources/{ZipContainer,ZipEntry,ZipError,ZipLocalHeader,ZipCentralDirectoryEntry,ZipEndOfCentralDirectory}.swift'
+    sp.source_files = 'Sources/{Zip*}.swift'
     sp.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DSWCOMP_ZIP_POD_BUILD' }
   end
 
   s.subspec 'TAR' do |sp|
-    sp.dependency 'SWCompression/Common'
-    sp.source_files = 'Sources/{TarContainer,TarEntry,TarError}.swift'
+    sp.source_files = 'Sources/{Tar*,Extensions,Protocols,DataWithPointer}.swift'
   end
 
 end
diff --git a/SWCompression.xcodeproj/project.pbxproj b/SWCompression.xcodeproj/project.pbxproj
index 2e0f5326..db4fc03c 100644
--- a/SWCompression.xcodeproj/project.pbxproj
+++ b/SWCompression.xcodeproj/project.pbxproj
@@ -547,6 +547,7 @@
 				063DF1061DE1F07800F38082 /* Extensions.swift */,
 				063DF1091DE1F07800F38082 /* Protocols.swift */,
 				0681B3DD1E44F674001A9D79 /* BitWriter.swift */,
+				063DF1081DE1F07800F38082 /* HuffmanTree.swift */,
 			);
 			path = Common;
 			sourceTree = "<group>";
@@ -598,7 +599,6 @@
 			isa = PBXGroup;
 			children = (
 				06A3931F1DE06FFE00182E12 /* Common */,
-				063DF1081DE1F07800F38082 /* HuffmanTree.swift */,
 				061FCE251DBCC4BE0052F7BE /* Deflate.swift */,
 				06CDFCA71F111D9700292758 /* DeflateError.swift */,
 				06CDFC9D1F111D2600292758 /* DeflateCompression.swift */,