diff --git a/GreedoLayout.podspec b/GreedoLayout.podspec
index 255bcf9..eb6b735 100644
--- a/GreedoLayout.podspec
+++ b/GreedoLayout.podspec
@@ -6,8 +6,8 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/500px/greedo-layout-for-ios"
   s.license      = 'MIT'
   s.author       = { "David Charlec" => "david@500px.com" }
-  s.source       = { :git => "git@github.com:500px/greedo-layout-for-ios.git", :tag => "0.0.1" }
+  s.source       = { :git => "git@github.com:500px/greedo-layout-for-ios.git", :tag => s.version }
   s.platform     = :ios, '6.0'
-  s.source_files = '*.{h,m}'
-  s.requires_arc = true  
-end
\ No newline at end of file
+  s.source_files = 'GreedoLayout/*.{h,m}'
+  s.requires_arc = true
+end
diff --git a/GreedoCollectionViewLayout.h b/GreedoLayout/GreedoCollectionViewLayout.h
similarity index 100%
rename from GreedoCollectionViewLayout.h
rename to GreedoLayout/GreedoCollectionViewLayout.h
diff --git a/GreedoCollectionViewLayout.m b/GreedoLayout/GreedoCollectionViewLayout.m
similarity index 100%
rename from GreedoCollectionViewLayout.m
rename to GreedoLayout/GreedoCollectionViewLayout.m