diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/admin_pw b/default-settings/admin_pw
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/defaults/admin_pw
rename to default-settings/admin_pw
diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/ip b/default-settings/ip
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/defaults/ip
rename to default-settings/ip
diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/language b/default-settings/language
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/defaults/language
rename to default-settings/language
diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/names.db b/default-settings/names.db
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/defaults/names.db
rename to default-settings/names.db
diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/timeout b/default-settings/timeout
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/defaults/timeout
rename to default-settings/timeout
diff --git a/cbox-tree.d/usr/share/cryptobox/defaults/version b/default-settings/version
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/defaults/version
rename to default-settings/version
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/README b/lang/README
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/lang/README
rename to lang/README
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/TODO b/lang/TODO
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/lang/TODO
rename to lang/TODO
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/de.hdf b/lang/de.hdf
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/lang/de.hdf
rename to lang/de.hdf
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/en.hdf b/lang/en.hdf
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/lang/en.hdf
rename to lang/en.hdf
diff --git a/cbox-tree.d/usr/share/cryptobox/lang/si.hdf b/lang/si.hdf
similarity index 100%
rename from cbox-tree.d/usr/share/cryptobox/lang/si.hdf
rename to lang/si.hdf
diff --git a/cbox-tree.d/templates/empty.cs b/templates/empty.cs
similarity index 100%
rename from cbox-tree.d/templates/empty.cs
rename to templates/empty.cs
diff --git a/cbox-tree.d/templates/error.cs b/templates/error.cs
similarity index 100%
rename from cbox-tree.d/templates/error.cs
rename to templates/error.cs
diff --git a/cbox-tree.d/templates/footer.cs b/templates/footer.cs
similarity index 100%
rename from cbox-tree.d/templates/footer.cs
rename to templates/footer.cs
diff --git a/cbox-tree.d/templates/form_config.cs b/templates/form_config.cs
similarity index 100%
rename from cbox-tree.d/templates/form_config.cs
rename to templates/form_config.cs
diff --git a/cbox-tree.d/templates/form_init.cs b/templates/form_init.cs
similarity index 100%
rename from cbox-tree.d/templates/form_init.cs
rename to templates/form_init.cs
diff --git a/cbox-tree.d/templates/form_mount.cs b/templates/form_mount.cs
similarity index 100%
rename from cbox-tree.d/templates/form_mount.cs
rename to templates/form_mount.cs
diff --git a/cbox-tree.d/templates/form_shutdown.cs b/templates/form_shutdown.cs
similarity index 100%
rename from cbox-tree.d/templates/form_shutdown.cs
rename to templates/form_shutdown.cs
diff --git a/cbox-tree.d/templates/form_umount.cs b/templates/form_umount.cs
similarity index 100%
rename from cbox-tree.d/templates/form_umount.cs
rename to templates/form_umount.cs
diff --git a/cbox-tree.d/templates/header.cs b/templates/header.cs
similarity index 100%
rename from cbox-tree.d/templates/header.cs
rename to templates/header.cs
diff --git a/cbox-tree.d/templates/macros.cs b/templates/macros.cs
similarity index 100%
rename from cbox-tree.d/templates/macros.cs
rename to templates/macros.cs
diff --git a/cbox-tree.d/templates/main.cs b/templates/main.cs
similarity index 100%
rename from cbox-tree.d/templates/main.cs
rename to templates/main.cs
diff --git a/cbox-tree.d/templates/nav.cs b/templates/nav.cs
similarity index 100%
rename from cbox-tree.d/templates/nav.cs
rename to templates/nav.cs
diff --git a/cbox-tree.d/templates/show_doc.cs b/templates/show_doc.cs
similarity index 100%
rename from cbox-tree.d/templates/show_doc.cs
rename to templates/show_doc.cs
diff --git a/cbox-tree.d/templates/show_log.cs b/templates/show_log.cs
similarity index 100%
rename from cbox-tree.d/templates/show_log.cs
rename to templates/show_log.cs
diff --git a/cbox-tree.d/templates/show_status.cs b/templates/show_status.cs
similarity index 100%
rename from cbox-tree.d/templates/show_status.cs
rename to templates/show_status.cs