diff --git a/lib/couch_rest/commands.rb b/lib/commands.rb
similarity index 100%
rename from lib/couch_rest/commands.rb
rename to lib/commands.rb
diff --git a/lib/couch_rest/commands/generate.rb b/lib/commands/generate.rb
similarity index 100%
rename from lib/couch_rest/commands/generate.rb
rename to lib/commands/generate.rb
diff --git a/lib/couch_rest/commands/push.rb b/lib/commands/push.rb
similarity index 100%
rename from lib/couch_rest/commands/push.rb
rename to lib/commands/push.rb
diff --git a/lib/couchrest.rb b/lib/couchrest/couchrest.rb
similarity index 100%
rename from lib/couchrest.rb
rename to lib/couchrest/couchrest.rb
diff --git a/lib/database.rb b/lib/couchrest/database.rb
similarity index 100%
rename from lib/database.rb
rename to lib/couchrest/database.rb
diff --git a/lib/file_manager.rb b/lib/helpers/file_manager.rb
similarity index 100%
rename from lib/file_manager.rb
rename to lib/helpers/file_manager.rb
diff --git a/lib/pager.rb b/lib/helpers/pager.rb
similarity index 100%
rename from lib/pager.rb
rename to lib/helpers/pager.rb
diff --git a/lib/streamer.rb b/lib/helpers/streamer.rb
similarity index 100%
rename from lib/streamer.rb
rename to lib/helpers/streamer.rb