diff --git a/src/js/dao/admin-dao.js b/src/js/service/admin.js
similarity index 100%
rename from src/js/dao/admin-dao.js
rename to src/js/service/admin.js
diff --git a/src/js/dao/devicestorage-dao.js b/src/js/service/devicestorage.js
similarity index 100%
rename from src/js/dao/devicestorage-dao.js
rename to src/js/service/devicestorage.js
diff --git a/src/js/dao/email-dao.js b/src/js/service/email.js
similarity index 100%
rename from src/js/dao/email-dao.js
rename to src/js/service/email.js
diff --git a/src/js/dao/invitation-dao.js b/src/js/service/invitation.js
similarity index 100%
rename from src/js/dao/invitation-dao.js
rename to src/js/service/invitation.js
diff --git a/src/js/dao/keychain-dao.js b/src/js/service/keychain.js
similarity index 100%
rename from src/js/dao/keychain-dao.js
rename to src/js/service/keychain.js
diff --git a/src/js/dao/lawnchair-dao.js b/src/js/service/lawnchair.js
similarity index 100%
rename from src/js/dao/lawnchair-dao.js
rename to src/js/service/lawnchair.js
diff --git a/src/js/dao/privatekey-dao.js b/src/js/service/privatekey.js
similarity index 100%
rename from src/js/dao/privatekey-dao.js
rename to src/js/service/privatekey.js
diff --git a/src/js/dao/publickey-dao.js b/src/js/service/publickey.js
similarity index 100%
rename from src/js/dao/publickey-dao.js
rename to src/js/service/publickey.js
diff --git a/src/js/dao/rest-dao.js b/src/js/service/rest.js
similarity index 100%
rename from src/js/dao/rest-dao.js
rename to src/js/service/rest.js