diff --git a/config/storage.yml b/app/config/storage.yml
similarity index 100%
rename from config/storage.yml
rename to app/config/storage.yml
diff --git a/ds_admin.rb b/app/ds_admin.rb
similarity index 100%
rename from ds_admin.rb
rename to app/ds_admin.rb
diff --git a/model.rb b/app/model.rb
similarity index 100%
rename from model.rb
rename to app/model.rb
diff --git a/model/group.rb b/app/model/group.rb
similarity index 100%
rename from model/group.rb
rename to app/model/group.rb
diff --git a/model/mail_account.rb b/app/model/mail_account.rb
similarity index 100%
rename from model/mail_account.rb
rename to app/model/mail_account.rb
diff --git a/model/mail_alias_person.rb b/app/model/mail_alias_person.rb
similarity index 100%
rename from model/mail_alias_person.rb
rename to app/model/mail_alias_person.rb
diff --git a/model/mail_alias_role.rb b/app/model/mail_alias_role.rb
similarity index 100%
rename from model/mail_alias_role.rb
rename to app/model/mail_alias_role.rb
diff --git a/model/site.rb b/app/model/site.rb
similarity index 100%
rename from model/site.rb
rename to app/model/site.rb
diff --git a/model/user.rb b/app/model/user.rb
similarity index 100%
rename from model/user.rb
rename to app/model/user.rb
diff --git a/storage.rb b/app/storage.rb
similarity index 100%
rename from storage.rb
rename to app/storage.rb
diff --git a/storage/config.rb b/app/storage/config.rb
similarity index 100%
rename from storage/config.rb
rename to app/storage/config.rb
diff --git a/storage/ldap.rb b/app/storage/ldap.rb
similarity index 100%
rename from storage/ldap.rb
rename to app/storage/ldap.rb
diff --git a/storage/mysql.rb b/app/storage/mysql.rb
similarity index 100%
rename from storage/mysql.rb
rename to app/storage/mysql.rb
diff --git a/tester.rb b/app/tester.rb
similarity index 100%
rename from tester.rb
rename to app/tester.rb
diff --git a/tests/test_model.rb b/tests/test_model.rb
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_storage.rb b/tests/test_storage.rb
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_storage_ldap.rb b/tests/test_storage_ldap.rb
new file mode 100644
index 0000000..e69de29