diff --git a/LICENSE b/core/LICENSE
similarity index 100%
rename from LICENSE
rename to core/LICENSE
diff --git a/README b/core/README
similarity index 100%
rename from README
rename to core/README
diff --git a/Rakefile b/core/Rakefile
similarity index 100%
rename from Rakefile
rename to core/Rakefile
diff --git a/TODO b/core/TODO
similarity index 100%
rename from TODO
rename to core/TODO
diff --git a/lib/generators/templates/uploader.rbt b/core/lib/generators/templates/uploader.rbt
similarity index 100%
rename from lib/generators/templates/uploader.rbt
rename to core/lib/generators/templates/uploader.rbt
diff --git a/lib/generators/uploader_generator.rb b/core/lib/generators/uploader_generator.rb
similarity index 100%
rename from lib/generators/uploader_generator.rb
rename to core/lib/generators/uploader_generator.rb
diff --git a/lib/merb_upload.rb b/core/lib/merb_upload.rb
similarity index 100%
rename from lib/merb_upload.rb
rename to core/lib/merb_upload.rb
diff --git a/lib/merb_upload/sanitized_file.rb b/core/lib/merb_upload/sanitized_file.rb
similarity index 100%
rename from lib/merb_upload/sanitized_file.rb
rename to core/lib/merb_upload/sanitized_file.rb
diff --git a/lib/merb_upload/storage/file.rb b/core/lib/merb_upload/storage/file.rb
similarity index 100%
rename from lib/merb_upload/storage/file.rb
rename to core/lib/merb_upload/storage/file.rb
diff --git a/lib/merb_upload/uploader.rb b/core/lib/merb_upload/uploader.rb
similarity index 100%
rename from lib/merb_upload/uploader.rb
rename to core/lib/merb_upload/uploader.rb
diff --git a/spec/fixtures/test.jpg b/core/spec/fixtures/test.jpg
similarity index 100%
rename from spec/fixtures/test.jpg
rename to core/spec/fixtures/test.jpg
diff --git a/spec/merb_upload_spec.rb b/core/spec/merb_upload_spec.rb
similarity index 100%
rename from spec/merb_upload_spec.rb
rename to core/spec/merb_upload_spec.rb
diff --git a/spec/sanitized_file_spec.rb b/core/spec/sanitized_file_spec.rb
similarity index 100%
rename from spec/sanitized_file_spec.rb
rename to core/spec/sanitized_file_spec.rb
diff --git a/spec/spec_helper.rb b/core/spec/spec_helper.rb
similarity index 100%
rename from spec/spec_helper.rb
rename to core/spec/spec_helper.rb
diff --git a/spec/uploader_spec.rb b/core/spec/uploader_spec.rb
similarity index 100%
rename from spec/uploader_spec.rb
rename to core/spec/uploader_spec.rb
diff --git a/test/merb_upload_test.rb b/core/test/merb_upload_test.rb
similarity index 100%
rename from test/merb_upload_test.rb
rename to core/test/merb_upload_test.rb
diff --git a/test/test_helper.rb b/core/test/test_helper.rb
similarity index 100%
rename from test/test_helper.rb
rename to core/test/test_helper.rb