diff --git a/lib/browser.rb b/lib/common/browser.rb
similarity index 100%
rename from lib/browser.rb
rename to lib/common/browser.rb
diff --git a/lib/cache_file_store.rb b/lib/common/cache_file_store.rb
similarity index 100%
rename from lib/cache_file_store.rb
rename to lib/common/cache_file_store.rb
diff --git a/lib/updater/git_updater.rb b/lib/common/updater/git_updater.rb
similarity index 100%
rename from lib/updater/git_updater.rb
rename to lib/common/updater/git_updater.rb
diff --git a/lib/updater/svn_updater.rb b/lib/common/updater/svn_updater.rb
similarity index 100%
rename from lib/updater/svn_updater.rb
rename to lib/common/updater/svn_updater.rb
diff --git a/lib/updater/updater.rb b/lib/common/updater/updater.rb
similarity index 100%
rename from lib/updater/updater.rb
rename to lib/common/updater/updater.rb
diff --git a/lib/updater/updater_factory.rb b/lib/common/updater/updater_factory.rb
similarity index 100%
rename from lib/updater/updater_factory.rb
rename to lib/common/updater/updater_factory.rb
diff --git a/lib/environment.rb b/lib/environment.rb
index 7b2be475..242cc96c 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -38,8 +38,8 @@ begin
   require 'json'
   require 'nokogiri'
   # Custom libs
-  require 'browser'
-  require 'cache_file_store'
+  require 'common/browser'
+  require 'common/cache_file_store'
   require 'common/custom_option_parser'
 rescue LoadError => e
   puts "[ERROR] #{e}"
diff --git a/spec/lib/browser_spec.rb b/spec/lib/common/browser_spec.rb
similarity index 100%
rename from spec/lib/browser_spec.rb
rename to spec/lib/common/browser_spec.rb
diff --git a/spec/lib/cache_file_store_spec.rb b/spec/lib/common/cache_file_store_spec.rb
similarity index 100%
rename from spec/lib/cache_file_store_spec.rb
rename to spec/lib/common/cache_file_store_spec.rb
diff --git a/spec/lib/updater/git_updater_spec.rb b/spec/lib/common/updater/git_updater_spec.rb
similarity index 100%
rename from spec/lib/updater/git_updater_spec.rb
rename to spec/lib/common/updater/git_updater_spec.rb
diff --git a/spec/lib/updater/svn_updater_spec.rb b/spec/lib/common/updater/svn_updater_spec.rb
similarity index 100%
rename from spec/lib/updater/svn_updater_spec.rb
rename to spec/lib/common/updater/svn_updater_spec.rb
diff --git a/spec/lib/updater/updater_factory_spec.rb b/spec/lib/common/updater/updater_factory_spec.rb
similarity index 100%
rename from spec/lib/updater/updater_factory_spec.rb
rename to spec/lib/common/updater/updater_factory_spec.rb
diff --git a/spec/lib/updater/updater_spec.rb b/spec/lib/common/updater/updater_spec.rb
similarity index 100%
rename from spec/lib/updater/updater_spec.rb
rename to spec/lib/common/updater/updater_spec.rb