diff --git a/makefile.js b/makefile.js
index bec27a12..6257699f 100644
--- a/makefile.js
+++ b/makefile.js
@@ -91,21 +91,21 @@ module.exports = function (make) {
 
 	make.target('lint', [], 'lint all JavaScript files with JSHint').sync(function () {
 
-		$(path.join(src, '_h5ai', 'js') + ': **/*.js, ! lib/**')
+		$(src + '/_h5ai/client/js: **/*.js, ! lib/**')
 			.jshint(jshint);
 	});
 
 
 	make.target('build', ['check-version'], 'build all updated files').sync(function () {
 
-		$(src + ': _h5ai/js/*.js')
-			.modified(mapSrc, $(src + ': _h5ai/js/**'))
+		$(src + ': _h5ai/client/js/*.js')
+			.modified(mapSrc, $(src + ': _h5ai/client/js/**'))
 			.includify()
 			.uglifyjs()
 			.write($.OVERWRITE, mapSrc);
 
-		$(src + ': _h5ai/css/*.less')
-			.modified(mapSrc, $(src + ': _h5ai/css/**'))
+		$(src + ': _h5ai/client/css/*.less')
+			.modified(mapSrc, $(src + ': _h5ai/client/css/**'))
 			.less()
 			.cssmin()
 			.write($.OVERWRITE, mapSrc);
@@ -116,7 +116,7 @@ module.exports = function (make) {
 			.jade()
 			.write($.OVERWRITE, mapSrc);
 
-		$(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade')
+		$(src + ': **, ! _h5ai/client/**, ! **/*.jade')
 			.modified(mapSrc)
 			.handlebars(handlebarsEnv)
 			.write($.OVERWRITE, mapSrc);
@@ -129,14 +129,14 @@ module.exports = function (make) {
 
 	make.target('build-uncompressed', ['check-version'], 'build all updated files without compression').sync(function () {
 
-		$(src + ': _h5ai/js/*.js')
-			.modified(mapSrc, $(src + ': _h5ai/js/**'))
+		$(src + ': _h5ai/client/js/*.js')
+			.modified(mapSrc, $(src + ': _h5ai/client/js/**'))
 			.includify()
 			// .uglifyjs()
 			.write($.OVERWRITE, mapSrc);
 
-		$(src + ': _h5ai/css/*.less')
-			.modified(mapSrc, $(src + ': _h5ai/css/**'))
+		$(src + ': _h5ai/client/css/*.less')
+			.modified(mapSrc, $(src + ': _h5ai/client/css/**'))
 			.less()
 			// .cssmin()
 			.write($.OVERWRITE, mapSrc);
@@ -147,7 +147,7 @@ module.exports = function (make) {
 			.jade()
 			.write($.OVERWRITE, mapSrc);
 
-		$(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade')
+		$(src + ': **, ! _h5ai/client/js/**, ! _h5ai/client/css/**, ! **/*.jade')
 			.modified(mapSrc)
 			.handlebars(handlebarsEnv)
 			.write($.OVERWRITE, mapSrc);
@@ -160,7 +160,7 @@ module.exports = function (make) {
 
 	make.target('release', ['clean', 'build'], 'create a zipball').async(function (done, fail) {
 
-		$(build + ': _h5ai/**').shzip({
+		$(build + ': **').shzip({
 			target: path.join(build, 'h5ai-' + pkg.version + '.zip'),
 			dir: build,
 			callback: done
diff --git a/src/_h5ai/css/inc/apache-autoindex-table.less b/src/_h5ai/client/css/inc/apache-autoindex-table.less
similarity index 100%
rename from src/_h5ai/css/inc/apache-autoindex-table.less
rename to src/_h5ai/client/css/inc/apache-autoindex-table.less
diff --git a/src/_h5ai/css/inc/bottombar.less b/src/_h5ai/client/css/inc/bottombar.less
similarity index 100%
rename from src/_h5ai/css/inc/bottombar.less
rename to src/_h5ai/client/css/inc/bottombar.less
diff --git a/src/_h5ai/css/inc/content.less b/src/_h5ai/client/css/inc/content.less
similarity index 100%
rename from src/_h5ai/css/inc/content.less
rename to src/_h5ai/client/css/inc/content.less
diff --git a/src/_h5ai/css/inc/context-menu.less b/src/_h5ai/client/css/inc/context-menu.less
similarity index 100%
rename from src/_h5ai/css/inc/context-menu.less
rename to src/_h5ai/client/css/inc/context-menu.less
diff --git a/src/_h5ai/css/inc/delete.less b/src/_h5ai/client/css/inc/delete.less
similarity index 100%
rename from src/_h5ai/css/inc/delete.less
rename to src/_h5ai/client/css/inc/delete.less
diff --git a/src/_h5ai/css/inc/download.less b/src/_h5ai/client/css/inc/download.less
similarity index 100%
rename from src/_h5ai/css/inc/download.less
rename to src/_h5ai/client/css/inc/download.less
diff --git a/src/_h5ai/css/inc/dropbox.less b/src/_h5ai/client/css/inc/dropbox.less
similarity index 100%
rename from src/_h5ai/css/inc/dropbox.less
rename to src/_h5ai/client/css/inc/dropbox.less
diff --git a/src/_h5ai/css/inc/extended-details.less b/src/_h5ai/client/css/inc/extended-details.less
similarity index 100%
rename from src/_h5ai/css/inc/extended-details.less
rename to src/_h5ai/client/css/inc/extended-details.less
diff --git a/src/_h5ai/css/inc/extended-grid.less b/src/_h5ai/client/css/inc/extended-grid.less
similarity index 100%
rename from src/_h5ai/css/inc/extended-grid.less
rename to src/_h5ai/client/css/inc/extended-grid.less
diff --git a/src/_h5ai/css/inc/extended-icons.less b/src/_h5ai/client/css/inc/extended-icons.less
similarity index 100%
rename from src/_h5ai/css/inc/extended-icons.less
rename to src/_h5ai/client/css/inc/extended-icons.less
diff --git a/src/_h5ai/css/inc/extended-list.less b/src/_h5ai/client/css/inc/extended-list.less
similarity index 100%
rename from src/_h5ai/css/inc/extended-list.less
rename to src/_h5ai/client/css/inc/extended-list.less
diff --git a/src/_h5ai/css/inc/extended.less b/src/_h5ai/client/css/inc/extended.less
similarity index 100%
rename from src/_h5ai/css/inc/extended.less
rename to src/_h5ai/client/css/inc/extended.less
diff --git a/src/_h5ai/css/inc/filter.less b/src/_h5ai/client/css/inc/filter.less
similarity index 100%
rename from src/_h5ai/css/inc/filter.less
rename to src/_h5ai/client/css/inc/filter.less
diff --git a/src/_h5ai/css/inc/general.less b/src/_h5ai/client/css/inc/general.less
similarity index 100%
rename from src/_h5ai/css/inc/general.less
rename to src/_h5ai/client/css/inc/general.less
diff --git a/src/_h5ai/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less
similarity index 100%
rename from src/_h5ai/css/inc/h5ai-info.less
rename to src/_h5ai/client/css/inc/h5ai-info.less
diff --git a/src/_h5ai/css/inc/l10n.less b/src/_h5ai/client/css/inc/l10n.less
similarity index 100%
rename from src/_h5ai/css/inc/l10n.less
rename to src/_h5ai/client/css/inc/l10n.less
diff --git a/src/_h5ai/css/inc/preview-img.less b/src/_h5ai/client/css/inc/preview-img.less
similarity index 100%
rename from src/_h5ai/css/inc/preview-img.less
rename to src/_h5ai/client/css/inc/preview-img.less
diff --git a/src/_h5ai/css/inc/preview-txt.less b/src/_h5ai/client/css/inc/preview-txt.less
similarity index 94%
rename from src/_h5ai/css/inc/preview-txt.less
rename to src/_h5ai/client/css/inc/preview-txt.less
index 668e67fe..413327a3 100644
--- a/src/_h5ai/css/inc/preview-txt.less
+++ b/src/_h5ai/client/css/inc/preview-txt.less
@@ -26,12 +26,17 @@
 }
 
 #pv-txt-text {
+	word-break: break-all;
+
 	.syntaxhighlighter {
 		overflow: visible !important;
 
 		.gutter .line {
 			border-right: none !important;
 		}
+		// .code .line, table td.code .container textarea {
+		// 	white-space: normal !important;
+		// }
 	}
 
 	&.markdown {
diff --git a/src/_h5ai/css/inc/qrcode.less b/src/_h5ai/client/css/inc/qrcode.less
similarity index 100%
rename from src/_h5ai/css/inc/qrcode.less
rename to src/_h5ai/client/css/inc/qrcode.less
diff --git a/src/_h5ai/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less
similarity index 100%
rename from src/_h5ai/css/inc/responsive.less
rename to src/_h5ai/client/css/inc/responsive.less
diff --git a/src/_h5ai/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less
similarity index 100%
rename from src/_h5ai/css/inc/topbar.less
rename to src/_h5ai/client/css/inc/topbar.less
diff --git a/src/_h5ai/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less
similarity index 100%
rename from src/_h5ai/css/inc/tree.less
rename to src/_h5ai/client/css/inc/tree.less
diff --git a/src/_h5ai/css/lib/h5bp-main-footer.less b/src/_h5ai/client/css/lib/h5bp-main-footer.less
similarity index 100%
rename from src/_h5ai/css/lib/h5bp-main-footer.less
rename to src/_h5ai/client/css/lib/h5bp-main-footer.less
diff --git a/src/_h5ai/css/lib/h5bp-main-header.less b/src/_h5ai/client/css/lib/h5bp-main-header.less
similarity index 100%
rename from src/_h5ai/css/lib/h5bp-main-header.less
rename to src/_h5ai/client/css/lib/h5bp-main-header.less
diff --git a/src/_h5ai/css/lib/h5bp-normalize.less b/src/_h5ai/client/css/lib/h5bp-normalize.less
similarity index 100%
rename from src/_h5ai/css/lib/h5bp-normalize.less
rename to src/_h5ai/client/css/lib/h5bp-normalize.less
diff --git a/src/_h5ai/css/lib/mixins.less b/src/_h5ai/client/css/lib/mixins.less
similarity index 100%
rename from src/_h5ai/css/lib/mixins.less
rename to src/_h5ai/client/css/lib/mixins.less
diff --git a/src/_h5ai/css/lib/sh/shCore.less b/src/_h5ai/client/css/lib/sh/shCore.less
similarity index 100%
rename from src/_h5ai/css/lib/sh/shCore.less
rename to src/_h5ai/client/css/lib/sh/shCore.less
diff --git a/src/_h5ai/css/lib/sh/shThemeDefault.less b/src/_h5ai/client/css/lib/sh/shThemeDefault.less
similarity index 100%
rename from src/_h5ai/css/lib/sh/shThemeDefault.less
rename to src/_h5ai/client/css/lib/sh/shThemeDefault.less
diff --git a/src/_h5ai/css/styles.less b/src/_h5ai/client/css/styles.less
similarity index 100%
rename from src/_h5ai/css/styles.less
rename to src/_h5ai/client/css/styles.less
diff --git a/src/_h5ai/icons/16x16/archive.png b/src/_h5ai/client/icons/16x16/archive.png
similarity index 100%
rename from src/_h5ai/icons/16x16/archive.png
rename to src/_h5ai/client/icons/16x16/archive.png
diff --git a/src/_h5ai/icons/16x16/audio.png b/src/_h5ai/client/icons/16x16/audio.png
similarity index 100%
rename from src/_h5ai/icons/16x16/audio.png
rename to src/_h5ai/client/icons/16x16/audio.png
diff --git a/src/_h5ai/icons/16x16/authors.png b/src/_h5ai/client/icons/16x16/authors.png
similarity index 100%
rename from src/_h5ai/icons/16x16/authors.png
rename to src/_h5ai/client/icons/16x16/authors.png
diff --git a/src/_h5ai/icons/16x16/bin.png b/src/_h5ai/client/icons/16x16/bin.png
similarity index 100%
rename from src/_h5ai/icons/16x16/bin.png
rename to src/_h5ai/client/icons/16x16/bin.png
diff --git a/src/_h5ai/icons/16x16/blank.png b/src/_h5ai/client/icons/16x16/blank.png
similarity index 100%
rename from src/_h5ai/icons/16x16/blank.png
rename to src/_h5ai/client/icons/16x16/blank.png
diff --git a/src/_h5ai/icons/16x16/bmp.png b/src/_h5ai/client/icons/16x16/bmp.png
similarity index 100%
rename from src/_h5ai/icons/16x16/bmp.png
rename to src/_h5ai/client/icons/16x16/bmp.png
diff --git a/src/_h5ai/icons/16x16/c.png b/src/_h5ai/client/icons/16x16/c.png
similarity index 100%
rename from src/_h5ai/icons/16x16/c.png
rename to src/_h5ai/client/icons/16x16/c.png
diff --git a/src/_h5ai/icons/16x16/calc.png b/src/_h5ai/client/icons/16x16/calc.png
similarity index 100%
rename from src/_h5ai/icons/16x16/calc.png
rename to src/_h5ai/client/icons/16x16/calc.png
diff --git a/src/_h5ai/icons/16x16/cd.png b/src/_h5ai/client/icons/16x16/cd.png
similarity index 100%
rename from src/_h5ai/icons/16x16/cd.png
rename to src/_h5ai/client/icons/16x16/cd.png
diff --git a/src/_h5ai/icons/16x16/copying.png b/src/_h5ai/client/icons/16x16/copying.png
similarity index 100%
rename from src/_h5ai/icons/16x16/copying.png
rename to src/_h5ai/client/icons/16x16/copying.png
diff --git a/src/_h5ai/icons/16x16/cpp.png b/src/_h5ai/client/icons/16x16/cpp.png
similarity index 100%
rename from src/_h5ai/icons/16x16/cpp.png
rename to src/_h5ai/client/icons/16x16/cpp.png
diff --git a/src/_h5ai/icons/16x16/css.png b/src/_h5ai/client/icons/16x16/css.png
similarity index 100%
rename from src/_h5ai/icons/16x16/css.png
rename to src/_h5ai/client/icons/16x16/css.png
diff --git a/src/_h5ai/icons/16x16/deb.png b/src/_h5ai/client/icons/16x16/deb.png
similarity index 100%
rename from src/_h5ai/icons/16x16/deb.png
rename to src/_h5ai/client/icons/16x16/deb.png
diff --git a/src/_h5ai/icons/16x16/default.png b/src/_h5ai/client/icons/16x16/default.png
similarity index 100%
rename from src/_h5ai/icons/16x16/default.png
rename to src/_h5ai/client/icons/16x16/default.png
diff --git a/src/_h5ai/icons/16x16/diff.png b/src/_h5ai/client/icons/16x16/diff.png
similarity index 100%
rename from src/_h5ai/icons/16x16/diff.png
rename to src/_h5ai/client/icons/16x16/diff.png
diff --git a/src/_h5ai/icons/16x16/doc.png b/src/_h5ai/client/icons/16x16/doc.png
similarity index 100%
rename from src/_h5ai/icons/16x16/doc.png
rename to src/_h5ai/client/icons/16x16/doc.png
diff --git a/src/_h5ai/icons/16x16/draw.png b/src/_h5ai/client/icons/16x16/draw.png
similarity index 100%
rename from src/_h5ai/icons/16x16/draw.png
rename to src/_h5ai/client/icons/16x16/draw.png
diff --git a/src/_h5ai/icons/16x16/eps.png b/src/_h5ai/client/icons/16x16/eps.png
similarity index 100%
rename from src/_h5ai/icons/16x16/eps.png
rename to src/_h5ai/client/icons/16x16/eps.png
diff --git a/src/_h5ai/icons/16x16/exe.png b/src/_h5ai/client/icons/16x16/exe.png
similarity index 100%
rename from src/_h5ai/icons/16x16/exe.png
rename to src/_h5ai/client/icons/16x16/exe.png
diff --git a/src/_h5ai/icons/16x16/folder-home.png b/src/_h5ai/client/icons/16x16/folder-home.png
similarity index 100%
rename from src/_h5ai/icons/16x16/folder-home.png
rename to src/_h5ai/client/icons/16x16/folder-home.png
diff --git a/src/_h5ai/icons/16x16/folder-open.png b/src/_h5ai/client/icons/16x16/folder-open.png
similarity index 100%
rename from src/_h5ai/icons/16x16/folder-open.png
rename to src/_h5ai/client/icons/16x16/folder-open.png
diff --git a/src/_h5ai/icons/16x16/folder-page.png b/src/_h5ai/client/icons/16x16/folder-page.png
similarity index 100%
rename from src/_h5ai/icons/16x16/folder-page.png
rename to src/_h5ai/client/icons/16x16/folder-page.png
diff --git a/src/_h5ai/icons/16x16/folder-parent-old.png b/src/_h5ai/client/icons/16x16/folder-parent-old.png
similarity index 100%
rename from src/_h5ai/icons/16x16/folder-parent-old.png
rename to src/_h5ai/client/icons/16x16/folder-parent-old.png
diff --git a/src/_h5ai/icons/16x16/folder-parent.png b/src/_h5ai/client/icons/16x16/folder-parent.png
similarity index 100%
rename from src/_h5ai/icons/16x16/folder-parent.png
rename to src/_h5ai/client/icons/16x16/folder-parent.png
diff --git a/src/_h5ai/icons/16x16/folder.png b/src/_h5ai/client/icons/16x16/folder.png
similarity index 100%
rename from src/_h5ai/icons/16x16/folder.png
rename to src/_h5ai/client/icons/16x16/folder.png
diff --git a/src/_h5ai/icons/16x16/gif.png b/src/_h5ai/client/icons/16x16/gif.png
similarity index 100%
rename from src/_h5ai/icons/16x16/gif.png
rename to src/_h5ai/client/icons/16x16/gif.png
diff --git a/src/_h5ai/icons/16x16/gzip.png b/src/_h5ai/client/icons/16x16/gzip.png
similarity index 100%
rename from src/_h5ai/icons/16x16/gzip.png
rename to src/_h5ai/client/icons/16x16/gzip.png
diff --git a/src/_h5ai/icons/16x16/h.png b/src/_h5ai/client/icons/16x16/h.png
similarity index 100%
rename from src/_h5ai/icons/16x16/h.png
rename to src/_h5ai/client/icons/16x16/h.png
diff --git a/src/_h5ai/icons/16x16/hpp.png b/src/_h5ai/client/icons/16x16/hpp.png
similarity index 100%
rename from src/_h5ai/icons/16x16/hpp.png
rename to src/_h5ai/client/icons/16x16/hpp.png
diff --git a/src/_h5ai/icons/16x16/html.png b/src/_h5ai/client/icons/16x16/html.png
similarity index 100%
rename from src/_h5ai/icons/16x16/html.png
rename to src/_h5ai/client/icons/16x16/html.png
diff --git a/src/_h5ai/icons/16x16/ico.png b/src/_h5ai/client/icons/16x16/ico.png
similarity index 100%
rename from src/_h5ai/icons/16x16/ico.png
rename to src/_h5ai/client/icons/16x16/ico.png
diff --git a/src/_h5ai/icons/16x16/image.png b/src/_h5ai/client/icons/16x16/image.png
similarity index 100%
rename from src/_h5ai/icons/16x16/image.png
rename to src/_h5ai/client/icons/16x16/image.png
diff --git a/src/_h5ai/icons/16x16/install.png b/src/_h5ai/client/icons/16x16/install.png
similarity index 100%
rename from src/_h5ai/icons/16x16/install.png
rename to src/_h5ai/client/icons/16x16/install.png
diff --git a/src/_h5ai/icons/16x16/java.png b/src/_h5ai/client/icons/16x16/java.png
similarity index 100%
rename from src/_h5ai/icons/16x16/java.png
rename to src/_h5ai/client/icons/16x16/java.png
diff --git a/src/_h5ai/icons/16x16/jpg.png b/src/_h5ai/client/icons/16x16/jpg.png
similarity index 100%
rename from src/_h5ai/icons/16x16/jpg.png
rename to src/_h5ai/client/icons/16x16/jpg.png
diff --git a/src/_h5ai/icons/16x16/js.png b/src/_h5ai/client/icons/16x16/js.png
similarity index 100%
rename from src/_h5ai/icons/16x16/js.png
rename to src/_h5ai/client/icons/16x16/js.png
diff --git a/src/_h5ai/icons/16x16/log.png b/src/_h5ai/client/icons/16x16/log.png
similarity index 100%
rename from src/_h5ai/icons/16x16/log.png
rename to src/_h5ai/client/icons/16x16/log.png
diff --git a/src/_h5ai/icons/16x16/makefile.png b/src/_h5ai/client/icons/16x16/makefile.png
similarity index 100%
rename from src/_h5ai/icons/16x16/makefile.png
rename to src/_h5ai/client/icons/16x16/makefile.png
diff --git a/src/_h5ai/icons/16x16/markdown.png b/src/_h5ai/client/icons/16x16/markdown.png
similarity index 100%
rename from src/_h5ai/icons/16x16/markdown.png
rename to src/_h5ai/client/icons/16x16/markdown.png
diff --git a/src/_h5ai/icons/16x16/package.png b/src/_h5ai/client/icons/16x16/package.png
similarity index 100%
rename from src/_h5ai/icons/16x16/package.png
rename to src/_h5ai/client/icons/16x16/package.png
diff --git a/src/_h5ai/icons/16x16/pdf.png b/src/_h5ai/client/icons/16x16/pdf.png
similarity index 100%
rename from src/_h5ai/icons/16x16/pdf.png
rename to src/_h5ai/client/icons/16x16/pdf.png
diff --git a/src/_h5ai/icons/16x16/php.png b/src/_h5ai/client/icons/16x16/php.png
similarity index 100%
rename from src/_h5ai/icons/16x16/php.png
rename to src/_h5ai/client/icons/16x16/php.png
diff --git a/src/_h5ai/icons/16x16/playlist.png b/src/_h5ai/client/icons/16x16/playlist.png
similarity index 100%
rename from src/_h5ai/icons/16x16/playlist.png
rename to src/_h5ai/client/icons/16x16/playlist.png
diff --git a/src/_h5ai/icons/16x16/png.png b/src/_h5ai/client/icons/16x16/png.png
similarity index 100%
rename from src/_h5ai/icons/16x16/png.png
rename to src/_h5ai/client/icons/16x16/png.png
diff --git a/src/_h5ai/icons/16x16/pres.png b/src/_h5ai/client/icons/16x16/pres.png
similarity index 100%
rename from src/_h5ai/icons/16x16/pres.png
rename to src/_h5ai/client/icons/16x16/pres.png
diff --git a/src/_h5ai/icons/16x16/ps.png b/src/_h5ai/client/icons/16x16/ps.png
similarity index 100%
rename from src/_h5ai/icons/16x16/ps.png
rename to src/_h5ai/client/icons/16x16/ps.png
diff --git a/src/_h5ai/icons/16x16/psd.png b/src/_h5ai/client/icons/16x16/psd.png
similarity index 100%
rename from src/_h5ai/icons/16x16/psd.png
rename to src/_h5ai/client/icons/16x16/psd.png
diff --git a/src/_h5ai/icons/16x16/py.png b/src/_h5ai/client/icons/16x16/py.png
similarity index 100%
rename from src/_h5ai/icons/16x16/py.png
rename to src/_h5ai/client/icons/16x16/py.png
diff --git a/src/_h5ai/icons/16x16/rar.png b/src/_h5ai/client/icons/16x16/rar.png
similarity index 100%
rename from src/_h5ai/icons/16x16/rar.png
rename to src/_h5ai/client/icons/16x16/rar.png
diff --git a/src/_h5ai/icons/16x16/rb.png b/src/_h5ai/client/icons/16x16/rb.png
similarity index 100%
rename from src/_h5ai/icons/16x16/rb.png
rename to src/_h5ai/client/icons/16x16/rb.png
diff --git a/src/_h5ai/icons/16x16/readme.png b/src/_h5ai/client/icons/16x16/readme.png
similarity index 100%
rename from src/_h5ai/icons/16x16/readme.png
rename to src/_h5ai/client/icons/16x16/readme.png
diff --git a/src/_h5ai/icons/16x16/rpm.png b/src/_h5ai/client/icons/16x16/rpm.png
similarity index 100%
rename from src/_h5ai/icons/16x16/rpm.png
rename to src/_h5ai/client/icons/16x16/rpm.png
diff --git a/src/_h5ai/icons/16x16/rss.png b/src/_h5ai/client/icons/16x16/rss.png
similarity index 100%
rename from src/_h5ai/icons/16x16/rss.png
rename to src/_h5ai/client/icons/16x16/rss.png
diff --git a/src/_h5ai/icons/16x16/rtf.png b/src/_h5ai/client/icons/16x16/rtf.png
similarity index 100%
rename from src/_h5ai/icons/16x16/rtf.png
rename to src/_h5ai/client/icons/16x16/rtf.png
diff --git a/src/_h5ai/icons/16x16/script.png b/src/_h5ai/client/icons/16x16/script.png
similarity index 100%
rename from src/_h5ai/icons/16x16/script.png
rename to src/_h5ai/client/icons/16x16/script.png
diff --git a/src/_h5ai/icons/16x16/source.png b/src/_h5ai/client/icons/16x16/source.png
similarity index 100%
rename from src/_h5ai/icons/16x16/source.png
rename to src/_h5ai/client/icons/16x16/source.png
diff --git a/src/_h5ai/icons/16x16/sql.png b/src/_h5ai/client/icons/16x16/sql.png
similarity index 100%
rename from src/_h5ai/icons/16x16/sql.png
rename to src/_h5ai/client/icons/16x16/sql.png
diff --git a/src/_h5ai/icons/16x16/tar.png b/src/_h5ai/client/icons/16x16/tar.png
similarity index 100%
rename from src/_h5ai/icons/16x16/tar.png
rename to src/_h5ai/client/icons/16x16/tar.png
diff --git a/src/_h5ai/icons/16x16/tex.png b/src/_h5ai/client/icons/16x16/tex.png
similarity index 100%
rename from src/_h5ai/icons/16x16/tex.png
rename to src/_h5ai/client/icons/16x16/tex.png
diff --git a/src/_h5ai/icons/16x16/text.png b/src/_h5ai/client/icons/16x16/text.png
similarity index 100%
rename from src/_h5ai/icons/16x16/text.png
rename to src/_h5ai/client/icons/16x16/text.png
diff --git a/src/_h5ai/icons/16x16/tiff.png b/src/_h5ai/client/icons/16x16/tiff.png
similarity index 100%
rename from src/_h5ai/icons/16x16/tiff.png
rename to src/_h5ai/client/icons/16x16/tiff.png
diff --git a/src/_h5ai/icons/16x16/unknown.png b/src/_h5ai/client/icons/16x16/unknown.png
similarity index 100%
rename from src/_h5ai/icons/16x16/unknown.png
rename to src/_h5ai/client/icons/16x16/unknown.png
diff --git a/src/_h5ai/icons/16x16/vcal.png b/src/_h5ai/client/icons/16x16/vcal.png
similarity index 100%
rename from src/_h5ai/icons/16x16/vcal.png
rename to src/_h5ai/client/icons/16x16/vcal.png
diff --git a/src/_h5ai/icons/16x16/video.png b/src/_h5ai/client/icons/16x16/video.png
similarity index 100%
rename from src/_h5ai/icons/16x16/video.png
rename to src/_h5ai/client/icons/16x16/video.png
diff --git a/src/_h5ai/icons/16x16/xml.png b/src/_h5ai/client/icons/16x16/xml.png
similarity index 100%
rename from src/_h5ai/icons/16x16/xml.png
rename to src/_h5ai/client/icons/16x16/xml.png
diff --git a/src/_h5ai/icons/16x16/zip.png b/src/_h5ai/client/icons/16x16/zip.png
similarity index 100%
rename from src/_h5ai/icons/16x16/zip.png
rename to src/_h5ai/client/icons/16x16/zip.png
diff --git a/src/_h5ai/icons/48x48/archive.png b/src/_h5ai/client/icons/48x48/archive.png
similarity index 100%
rename from src/_h5ai/icons/48x48/archive.png
rename to src/_h5ai/client/icons/48x48/archive.png
diff --git a/src/_h5ai/icons/48x48/audio.png b/src/_h5ai/client/icons/48x48/audio.png
similarity index 100%
rename from src/_h5ai/icons/48x48/audio.png
rename to src/_h5ai/client/icons/48x48/audio.png
diff --git a/src/_h5ai/icons/48x48/authors.png b/src/_h5ai/client/icons/48x48/authors.png
similarity index 100%
rename from src/_h5ai/icons/48x48/authors.png
rename to src/_h5ai/client/icons/48x48/authors.png
diff --git a/src/_h5ai/icons/48x48/bin.png b/src/_h5ai/client/icons/48x48/bin.png
similarity index 100%
rename from src/_h5ai/icons/48x48/bin.png
rename to src/_h5ai/client/icons/48x48/bin.png
diff --git a/src/_h5ai/icons/48x48/blank.png b/src/_h5ai/client/icons/48x48/blank.png
similarity index 100%
rename from src/_h5ai/icons/48x48/blank.png
rename to src/_h5ai/client/icons/48x48/blank.png
diff --git a/src/_h5ai/icons/48x48/bmp.png b/src/_h5ai/client/icons/48x48/bmp.png
similarity index 100%
rename from src/_h5ai/icons/48x48/bmp.png
rename to src/_h5ai/client/icons/48x48/bmp.png
diff --git a/src/_h5ai/icons/48x48/c.png b/src/_h5ai/client/icons/48x48/c.png
similarity index 100%
rename from src/_h5ai/icons/48x48/c.png
rename to src/_h5ai/client/icons/48x48/c.png
diff --git a/src/_h5ai/icons/48x48/calc.png b/src/_h5ai/client/icons/48x48/calc.png
similarity index 100%
rename from src/_h5ai/icons/48x48/calc.png
rename to src/_h5ai/client/icons/48x48/calc.png
diff --git a/src/_h5ai/icons/48x48/cd.png b/src/_h5ai/client/icons/48x48/cd.png
similarity index 100%
rename from src/_h5ai/icons/48x48/cd.png
rename to src/_h5ai/client/icons/48x48/cd.png
diff --git a/src/_h5ai/icons/48x48/copying.png b/src/_h5ai/client/icons/48x48/copying.png
similarity index 100%
rename from src/_h5ai/icons/48x48/copying.png
rename to src/_h5ai/client/icons/48x48/copying.png
diff --git a/src/_h5ai/icons/48x48/cpp.png b/src/_h5ai/client/icons/48x48/cpp.png
similarity index 100%
rename from src/_h5ai/icons/48x48/cpp.png
rename to src/_h5ai/client/icons/48x48/cpp.png
diff --git a/src/_h5ai/icons/48x48/css.png b/src/_h5ai/client/icons/48x48/css.png
similarity index 100%
rename from src/_h5ai/icons/48x48/css.png
rename to src/_h5ai/client/icons/48x48/css.png
diff --git a/src/_h5ai/icons/48x48/deb.png b/src/_h5ai/client/icons/48x48/deb.png
similarity index 100%
rename from src/_h5ai/icons/48x48/deb.png
rename to src/_h5ai/client/icons/48x48/deb.png
diff --git a/src/_h5ai/icons/48x48/default.png b/src/_h5ai/client/icons/48x48/default.png
similarity index 100%
rename from src/_h5ai/icons/48x48/default.png
rename to src/_h5ai/client/icons/48x48/default.png
diff --git a/src/_h5ai/icons/48x48/diff.png b/src/_h5ai/client/icons/48x48/diff.png
similarity index 100%
rename from src/_h5ai/icons/48x48/diff.png
rename to src/_h5ai/client/icons/48x48/diff.png
diff --git a/src/_h5ai/icons/48x48/doc.png b/src/_h5ai/client/icons/48x48/doc.png
similarity index 100%
rename from src/_h5ai/icons/48x48/doc.png
rename to src/_h5ai/client/icons/48x48/doc.png
diff --git a/src/_h5ai/icons/48x48/draw.png b/src/_h5ai/client/icons/48x48/draw.png
similarity index 100%
rename from src/_h5ai/icons/48x48/draw.png
rename to src/_h5ai/client/icons/48x48/draw.png
diff --git a/src/_h5ai/icons/48x48/eps.png b/src/_h5ai/client/icons/48x48/eps.png
similarity index 100%
rename from src/_h5ai/icons/48x48/eps.png
rename to src/_h5ai/client/icons/48x48/eps.png
diff --git a/src/_h5ai/icons/48x48/exe.png b/src/_h5ai/client/icons/48x48/exe.png
similarity index 100%
rename from src/_h5ai/icons/48x48/exe.png
rename to src/_h5ai/client/icons/48x48/exe.png
diff --git a/src/_h5ai/icons/48x48/folder-home.png b/src/_h5ai/client/icons/48x48/folder-home.png
similarity index 100%
rename from src/_h5ai/icons/48x48/folder-home.png
rename to src/_h5ai/client/icons/48x48/folder-home.png
diff --git a/src/_h5ai/icons/48x48/folder-open.png b/src/_h5ai/client/icons/48x48/folder-open.png
similarity index 100%
rename from src/_h5ai/icons/48x48/folder-open.png
rename to src/_h5ai/client/icons/48x48/folder-open.png
diff --git a/src/_h5ai/icons/48x48/folder-page.png b/src/_h5ai/client/icons/48x48/folder-page.png
similarity index 100%
rename from src/_h5ai/icons/48x48/folder-page.png
rename to src/_h5ai/client/icons/48x48/folder-page.png
diff --git a/src/_h5ai/icons/48x48/folder-parent.png b/src/_h5ai/client/icons/48x48/folder-parent.png
similarity index 100%
rename from src/_h5ai/icons/48x48/folder-parent.png
rename to src/_h5ai/client/icons/48x48/folder-parent.png
diff --git a/src/_h5ai/icons/48x48/folder.png b/src/_h5ai/client/icons/48x48/folder.png
similarity index 100%
rename from src/_h5ai/icons/48x48/folder.png
rename to src/_h5ai/client/icons/48x48/folder.png
diff --git a/src/_h5ai/icons/48x48/gif.png b/src/_h5ai/client/icons/48x48/gif.png
similarity index 100%
rename from src/_h5ai/icons/48x48/gif.png
rename to src/_h5ai/client/icons/48x48/gif.png
diff --git a/src/_h5ai/icons/48x48/gzip.png b/src/_h5ai/client/icons/48x48/gzip.png
similarity index 100%
rename from src/_h5ai/icons/48x48/gzip.png
rename to src/_h5ai/client/icons/48x48/gzip.png
diff --git a/src/_h5ai/icons/48x48/h.png b/src/_h5ai/client/icons/48x48/h.png
similarity index 100%
rename from src/_h5ai/icons/48x48/h.png
rename to src/_h5ai/client/icons/48x48/h.png
diff --git a/src/_h5ai/icons/48x48/hpp.png b/src/_h5ai/client/icons/48x48/hpp.png
similarity index 100%
rename from src/_h5ai/icons/48x48/hpp.png
rename to src/_h5ai/client/icons/48x48/hpp.png
diff --git a/src/_h5ai/icons/48x48/html.png b/src/_h5ai/client/icons/48x48/html.png
similarity index 100%
rename from src/_h5ai/icons/48x48/html.png
rename to src/_h5ai/client/icons/48x48/html.png
diff --git a/src/_h5ai/icons/48x48/ico.png b/src/_h5ai/client/icons/48x48/ico.png
similarity index 100%
rename from src/_h5ai/icons/48x48/ico.png
rename to src/_h5ai/client/icons/48x48/ico.png
diff --git a/src/_h5ai/icons/48x48/image.png b/src/_h5ai/client/icons/48x48/image.png
similarity index 100%
rename from src/_h5ai/icons/48x48/image.png
rename to src/_h5ai/client/icons/48x48/image.png
diff --git a/src/_h5ai/icons/48x48/install.png b/src/_h5ai/client/icons/48x48/install.png
similarity index 100%
rename from src/_h5ai/icons/48x48/install.png
rename to src/_h5ai/client/icons/48x48/install.png
diff --git a/src/_h5ai/icons/48x48/java.png b/src/_h5ai/client/icons/48x48/java.png
similarity index 100%
rename from src/_h5ai/icons/48x48/java.png
rename to src/_h5ai/client/icons/48x48/java.png
diff --git a/src/_h5ai/icons/48x48/jpg.png b/src/_h5ai/client/icons/48x48/jpg.png
similarity index 100%
rename from src/_h5ai/icons/48x48/jpg.png
rename to src/_h5ai/client/icons/48x48/jpg.png
diff --git a/src/_h5ai/icons/48x48/js.png b/src/_h5ai/client/icons/48x48/js.png
similarity index 100%
rename from src/_h5ai/icons/48x48/js.png
rename to src/_h5ai/client/icons/48x48/js.png
diff --git a/src/_h5ai/icons/48x48/log.png b/src/_h5ai/client/icons/48x48/log.png
similarity index 100%
rename from src/_h5ai/icons/48x48/log.png
rename to src/_h5ai/client/icons/48x48/log.png
diff --git a/src/_h5ai/icons/48x48/makefile.png b/src/_h5ai/client/icons/48x48/makefile.png
similarity index 100%
rename from src/_h5ai/icons/48x48/makefile.png
rename to src/_h5ai/client/icons/48x48/makefile.png
diff --git a/src/_h5ai/icons/48x48/markdown.png b/src/_h5ai/client/icons/48x48/markdown.png
similarity index 100%
rename from src/_h5ai/icons/48x48/markdown.png
rename to src/_h5ai/client/icons/48x48/markdown.png
diff --git a/src/_h5ai/icons/48x48/package.png b/src/_h5ai/client/icons/48x48/package.png
similarity index 100%
rename from src/_h5ai/icons/48x48/package.png
rename to src/_h5ai/client/icons/48x48/package.png
diff --git a/src/_h5ai/icons/48x48/pdf.png b/src/_h5ai/client/icons/48x48/pdf.png
similarity index 100%
rename from src/_h5ai/icons/48x48/pdf.png
rename to src/_h5ai/client/icons/48x48/pdf.png
diff --git a/src/_h5ai/icons/48x48/php.png b/src/_h5ai/client/icons/48x48/php.png
similarity index 100%
rename from src/_h5ai/icons/48x48/php.png
rename to src/_h5ai/client/icons/48x48/php.png
diff --git a/src/_h5ai/icons/48x48/playlist.png b/src/_h5ai/client/icons/48x48/playlist.png
similarity index 100%
rename from src/_h5ai/icons/48x48/playlist.png
rename to src/_h5ai/client/icons/48x48/playlist.png
diff --git a/src/_h5ai/icons/48x48/png.png b/src/_h5ai/client/icons/48x48/png.png
similarity index 100%
rename from src/_h5ai/icons/48x48/png.png
rename to src/_h5ai/client/icons/48x48/png.png
diff --git a/src/_h5ai/icons/48x48/pres.png b/src/_h5ai/client/icons/48x48/pres.png
similarity index 100%
rename from src/_h5ai/icons/48x48/pres.png
rename to src/_h5ai/client/icons/48x48/pres.png
diff --git a/src/_h5ai/icons/48x48/ps.png b/src/_h5ai/client/icons/48x48/ps.png
similarity index 100%
rename from src/_h5ai/icons/48x48/ps.png
rename to src/_h5ai/client/icons/48x48/ps.png
diff --git a/src/_h5ai/icons/48x48/psd.png b/src/_h5ai/client/icons/48x48/psd.png
similarity index 100%
rename from src/_h5ai/icons/48x48/psd.png
rename to src/_h5ai/client/icons/48x48/psd.png
diff --git a/src/_h5ai/icons/48x48/py.png b/src/_h5ai/client/icons/48x48/py.png
similarity index 100%
rename from src/_h5ai/icons/48x48/py.png
rename to src/_h5ai/client/icons/48x48/py.png
diff --git a/src/_h5ai/icons/48x48/rar.png b/src/_h5ai/client/icons/48x48/rar.png
similarity index 100%
rename from src/_h5ai/icons/48x48/rar.png
rename to src/_h5ai/client/icons/48x48/rar.png
diff --git a/src/_h5ai/icons/48x48/rb.png b/src/_h5ai/client/icons/48x48/rb.png
similarity index 100%
rename from src/_h5ai/icons/48x48/rb.png
rename to src/_h5ai/client/icons/48x48/rb.png
diff --git a/src/_h5ai/icons/48x48/readme.png b/src/_h5ai/client/icons/48x48/readme.png
similarity index 100%
rename from src/_h5ai/icons/48x48/readme.png
rename to src/_h5ai/client/icons/48x48/readme.png
diff --git a/src/_h5ai/icons/48x48/rpm.png b/src/_h5ai/client/icons/48x48/rpm.png
similarity index 100%
rename from src/_h5ai/icons/48x48/rpm.png
rename to src/_h5ai/client/icons/48x48/rpm.png
diff --git a/src/_h5ai/icons/48x48/rss.png b/src/_h5ai/client/icons/48x48/rss.png
similarity index 100%
rename from src/_h5ai/icons/48x48/rss.png
rename to src/_h5ai/client/icons/48x48/rss.png
diff --git a/src/_h5ai/icons/48x48/rtf.png b/src/_h5ai/client/icons/48x48/rtf.png
similarity index 100%
rename from src/_h5ai/icons/48x48/rtf.png
rename to src/_h5ai/client/icons/48x48/rtf.png
diff --git a/src/_h5ai/icons/48x48/script.png b/src/_h5ai/client/icons/48x48/script.png
similarity index 100%
rename from src/_h5ai/icons/48x48/script.png
rename to src/_h5ai/client/icons/48x48/script.png
diff --git a/src/_h5ai/icons/48x48/source.png b/src/_h5ai/client/icons/48x48/source.png
similarity index 100%
rename from src/_h5ai/icons/48x48/source.png
rename to src/_h5ai/client/icons/48x48/source.png
diff --git a/src/_h5ai/icons/48x48/sql.png b/src/_h5ai/client/icons/48x48/sql.png
similarity index 100%
rename from src/_h5ai/icons/48x48/sql.png
rename to src/_h5ai/client/icons/48x48/sql.png
diff --git a/src/_h5ai/icons/48x48/tar.png b/src/_h5ai/client/icons/48x48/tar.png
similarity index 100%
rename from src/_h5ai/icons/48x48/tar.png
rename to src/_h5ai/client/icons/48x48/tar.png
diff --git a/src/_h5ai/icons/48x48/tex.png b/src/_h5ai/client/icons/48x48/tex.png
similarity index 100%
rename from src/_h5ai/icons/48x48/tex.png
rename to src/_h5ai/client/icons/48x48/tex.png
diff --git a/src/_h5ai/icons/48x48/text.png b/src/_h5ai/client/icons/48x48/text.png
similarity index 100%
rename from src/_h5ai/icons/48x48/text.png
rename to src/_h5ai/client/icons/48x48/text.png
diff --git a/src/_h5ai/icons/48x48/tiff.png b/src/_h5ai/client/icons/48x48/tiff.png
similarity index 100%
rename from src/_h5ai/icons/48x48/tiff.png
rename to src/_h5ai/client/icons/48x48/tiff.png
diff --git a/src/_h5ai/icons/48x48/unknown.png b/src/_h5ai/client/icons/48x48/unknown.png
similarity index 100%
rename from src/_h5ai/icons/48x48/unknown.png
rename to src/_h5ai/client/icons/48x48/unknown.png
diff --git a/src/_h5ai/icons/48x48/vcal.png b/src/_h5ai/client/icons/48x48/vcal.png
similarity index 100%
rename from src/_h5ai/icons/48x48/vcal.png
rename to src/_h5ai/client/icons/48x48/vcal.png
diff --git a/src/_h5ai/icons/48x48/video.png b/src/_h5ai/client/icons/48x48/video.png
similarity index 100%
rename from src/_h5ai/icons/48x48/video.png
rename to src/_h5ai/client/icons/48x48/video.png
diff --git a/src/_h5ai/icons/48x48/xml.png b/src/_h5ai/client/icons/48x48/xml.png
similarity index 100%
rename from src/_h5ai/icons/48x48/xml.png
rename to src/_h5ai/client/icons/48x48/xml.png
diff --git a/src/_h5ai/icons/48x48/zip.png b/src/_h5ai/client/icons/48x48/zip.png
similarity index 100%
rename from src/_h5ai/icons/48x48/zip.png
rename to src/_h5ai/client/icons/48x48/zip.png
diff --git a/src/_h5ai/images/h5ai-16x16.ico b/src/_h5ai/client/images/app-16x16.ico
similarity index 100%
rename from src/_h5ai/images/h5ai-16x16.ico
rename to src/_h5ai/client/images/app-16x16.ico
diff --git a/src/_h5ai/images/h5ai-48x48.png b/src/_h5ai/client/images/app-48x48.png
similarity index 100%
rename from src/_h5ai/images/h5ai-48x48.png
rename to src/_h5ai/client/images/app-48x48.png
diff --git a/src/_h5ai/images/ascending.png b/src/_h5ai/client/images/ascending.png
similarity index 100%
rename from src/_h5ai/images/ascending.png
rename to src/_h5ai/client/images/ascending.png
diff --git a/src/_h5ai/images/blank.png b/src/_h5ai/client/images/blank.png
similarity index 100%
rename from src/_h5ai/images/blank.png
rename to src/_h5ai/client/images/blank.png
diff --git a/src/_h5ai/images/crumb.png b/src/_h5ai/client/images/crumb.png
similarity index 100%
rename from src/_h5ai/images/crumb.png
rename to src/_h5ai/client/images/crumb.png
diff --git a/src/_h5ai/images/delete.png b/src/_h5ai/client/images/delete.png
similarity index 100%
rename from src/_h5ai/images/delete.png
rename to src/_h5ai/client/images/delete.png
diff --git a/src/_h5ai/images/descending.png b/src/_h5ai/client/images/descending.png
similarity index 100%
rename from src/_h5ai/images/descending.png
rename to src/_h5ai/client/images/descending.png
diff --git a/src/_h5ai/images/download.png b/src/_h5ai/client/images/download.png
similarity index 100%
rename from src/_h5ai/images/download.png
rename to src/_h5ai/client/images/download.png
diff --git a/src/_h5ai/images/filter.png b/src/_h5ai/client/images/filter.png
similarity index 100%
rename from src/_h5ai/images/filter.png
rename to src/_h5ai/client/images/filter.png
diff --git a/src/_h5ai/images/home.png b/src/_h5ai/client/images/home.png
similarity index 100%
rename from src/_h5ai/images/home.png
rename to src/_h5ai/client/images/home.png
diff --git a/src/_h5ai/images/loading.gif b/src/_h5ai/client/images/loading.gif
similarity index 100%
rename from src/_h5ai/images/loading.gif
rename to src/_h5ai/client/images/loading.gif
diff --git a/src/_h5ai/images/loading.png b/src/_h5ai/client/images/loading.png
similarity index 100%
rename from src/_h5ai/images/loading.png
rename to src/_h5ai/client/images/loading.png
diff --git a/src/_h5ai/images/page.png b/src/_h5ai/client/images/page.png
similarity index 100%
rename from src/_h5ai/images/page.png
rename to src/_h5ai/client/images/page.png
diff --git a/src/_h5ai/images/preview/close.png b/src/_h5ai/client/images/preview/close.png
similarity index 100%
rename from src/_h5ai/images/preview/close.png
rename to src/_h5ai/client/images/preview/close.png
diff --git a/src/_h5ai/images/preview/crumb.png b/src/_h5ai/client/images/preview/crumb.png
similarity index 100%
rename from src/_h5ai/images/preview/crumb.png
rename to src/_h5ai/client/images/preview/crumb.png
diff --git a/src/_h5ai/images/preview/fullscreen.png b/src/_h5ai/client/images/preview/fullscreen.png
similarity index 100%
rename from src/_h5ai/images/preview/fullscreen.png
rename to src/_h5ai/client/images/preview/fullscreen.png
diff --git a/src/_h5ai/images/preview/home.png b/src/_h5ai/client/images/preview/home.png
similarity index 100%
rename from src/_h5ai/images/preview/home.png
rename to src/_h5ai/client/images/preview/home.png
diff --git a/src/_h5ai/images/preview/next.png b/src/_h5ai/client/images/preview/next.png
similarity index 100%
rename from src/_h5ai/images/preview/next.png
rename to src/_h5ai/client/images/preview/next.png
diff --git a/src/_h5ai/images/preview/no-fullscreen.png b/src/_h5ai/client/images/preview/no-fullscreen.png
similarity index 100%
rename from src/_h5ai/images/preview/no-fullscreen.png
rename to src/_h5ai/client/images/preview/no-fullscreen.png
diff --git a/src/_h5ai/images/preview/play.png b/src/_h5ai/client/images/preview/play.png
similarity index 100%
rename from src/_h5ai/images/preview/play.png
rename to src/_h5ai/client/images/preview/play.png
diff --git a/src/_h5ai/images/preview/prev.png b/src/_h5ai/client/images/preview/prev.png
similarity index 100%
rename from src/_h5ai/images/preview/prev.png
rename to src/_h5ai/client/images/preview/prev.png
diff --git a/src/_h5ai/images/preview/raw.png b/src/_h5ai/client/images/preview/raw.png
similarity index 100%
rename from src/_h5ai/images/preview/raw.png
rename to src/_h5ai/client/images/preview/raw.png
diff --git a/src/_h5ai/images/tree.png b/src/_h5ai/client/images/tree.png
similarity index 100%
rename from src/_h5ai/images/tree.png
rename to src/_h5ai/client/images/tree.png
diff --git a/src/_h5ai/images/view-details.png b/src/_h5ai/client/images/view-details.png
similarity index 100%
rename from src/_h5ai/images/view-details.png
rename to src/_h5ai/client/images/view-details.png
diff --git a/src/_h5ai/images/view-grid.png b/src/_h5ai/client/images/view-grid.png
similarity index 100%
rename from src/_h5ai/images/view-grid.png
rename to src/_h5ai/client/images/view-grid.png
diff --git a/src/_h5ai/images/view-icons.png b/src/_h5ai/client/images/view-icons.png
similarity index 100%
rename from src/_h5ai/images/view-icons.png
rename to src/_h5ai/client/images/view-icons.png
diff --git a/src/_h5ai/images/view-list.png b/src/_h5ai/client/images/view-list.png
similarity index 100%
rename from src/_h5ai/images/view-list.png
rename to src/_h5ai/client/images/view-list.png
diff --git a/src/_h5ai/js/inc/core/ajax.js b/src/_h5ai/client/js/inc/core/ajax.js
similarity index 100%
rename from src/_h5ai/js/inc/core/ajax.js
rename to src/_h5ai/client/js/inc/core/ajax.js
diff --git a/src/_h5ai/js/inc/core/entry.js b/src/_h5ai/client/js/inc/core/entry.js
similarity index 100%
rename from src/_h5ai/js/inc/core/entry.js
rename to src/_h5ai/client/js/inc/core/entry.js
diff --git a/src/_h5ai/js/inc/core/event.js b/src/_h5ai/client/js/inc/core/event.js
similarity index 100%
rename from src/_h5ai/js/inc/core/event.js
rename to src/_h5ai/client/js/inc/core/event.js
diff --git a/src/_h5ai/js/inc/core/format.js b/src/_h5ai/client/js/inc/core/format.js
similarity index 100%
rename from src/_h5ai/js/inc/core/format.js
rename to src/_h5ai/client/js/inc/core/format.js
diff --git a/src/_h5ai/js/inc/core/langs.js b/src/_h5ai/client/js/inc/core/langs.js
similarity index 100%
rename from src/_h5ai/js/inc/core/langs.js
rename to src/_h5ai/client/js/inc/core/langs.js
diff --git a/src/_h5ai/js/inc/core/mode.js b/src/_h5ai/client/js/inc/core/mode.js
similarity index 100%
rename from src/_h5ai/js/inc/core/mode.js
rename to src/_h5ai/client/js/inc/core/mode.js
diff --git a/src/_h5ai/js/inc/core/parser.js b/src/_h5ai/client/js/inc/core/parser.js
similarity index 100%
rename from src/_h5ai/js/inc/core/parser.js
rename to src/_h5ai/client/js/inc/core/parser.js
diff --git a/src/_h5ai/js/inc/core/refresh.js b/src/_h5ai/client/js/inc/core/refresh.js
similarity index 100%
rename from src/_h5ai/js/inc/core/refresh.js
rename to src/_h5ai/client/js/inc/core/refresh.js
diff --git a/src/_h5ai/js/inc/core/resource.js b/src/_h5ai/client/js/inc/core/resource.js
similarity index 50%
rename from src/_h5ai/js/inc/core/resource.js
rename to src/_h5ai/client/js/inc/core/resource.js
index 17baed3c..fd866a1d 100644
--- a/src/_h5ai/js/inc/core/resource.js
+++ b/src/_h5ai/client/js/inc/core/resource.js
@@ -3,15 +3,15 @@ modulejs.define('core/resource', ['core/settings'], function (settings) {
 
 	var api = function () {
 
-			return settings.h5aiAbsHref + 'php/api.php';
+			return settings.h5aiAbsHref + 'server/php/api.php';
 		},
 		image = function (id, noPngExt) {
 
-			return settings.h5aiAbsHref + 'images/' + id + (noPngExt ? '' : '.png');
+			return settings.h5aiAbsHref + 'client/images/' + id + (noPngExt ? '' : '.png');
 		},
 		icon = function (id, big) {
 
-			return settings.h5aiAbsHref + 'icons/' + (big ? '48x48' : '16x16') + '/' + id + '.png';
+			return settings.h5aiAbsHref + 'client/icons/' + (big ? '48x48' : '16x16') + '/' + id + '.png';
 		};
 
 	return {
diff --git a/src/_h5ai/js/inc/core/settings.js b/src/_h5ai/client/js/inc/core/settings.js
similarity index 100%
rename from src/_h5ai/js/inc/core/settings.js
rename to src/_h5ai/client/js/inc/core/settings.js
diff --git a/src/_h5ai/js/inc/core/store.js b/src/_h5ai/client/js/inc/core/store.js
similarity index 100%
rename from src/_h5ai/js/inc/core/store.js
rename to src/_h5ai/client/js/inc/core/store.js
diff --git a/src/_h5ai/js/inc/core/types.js b/src/_h5ai/client/js/inc/core/types.js
similarity index 100%
rename from src/_h5ai/js/inc/core/types.js
rename to src/_h5ai/client/js/inc/core/types.js
diff --git a/src/_h5ai/js/inc/ext/autorefresh.js b/src/_h5ai/client/js/inc/ext/autorefresh.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/autorefresh.js
rename to src/_h5ai/client/js/inc/ext/autorefresh.js
diff --git a/src/_h5ai/js/inc/ext/crumb.js b/src/_h5ai/client/js/inc/ext/crumb.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/crumb.js
rename to src/_h5ai/client/js/inc/ext/crumb.js
diff --git a/src/_h5ai/js/inc/ext/custom.js b/src/_h5ai/client/js/inc/ext/custom.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/custom.js
rename to src/_h5ai/client/js/inc/ext/custom.js
diff --git a/src/_h5ai/js/inc/ext/delete.js b/src/_h5ai/client/js/inc/ext/delete.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/delete.js
rename to src/_h5ai/client/js/inc/ext/delete.js
diff --git a/src/_h5ai/js/inc/ext/download.js b/src/_h5ai/client/js/inc/ext/download.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/download.js
rename to src/_h5ai/client/js/inc/ext/download.js
diff --git a/src/_h5ai/js/inc/ext/dropbox.js b/src/_h5ai/client/js/inc/ext/dropbox.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/dropbox.js
rename to src/_h5ai/client/js/inc/ext/dropbox.js
diff --git a/src/_h5ai/js/inc/ext/filter.js b/src/_h5ai/client/js/inc/ext/filter.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/filter.js
rename to src/_h5ai/client/js/inc/ext/filter.js
diff --git a/src/_h5ai/js/inc/ext/folderstatus.js b/src/_h5ai/client/js/inc/ext/folderstatus.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/folderstatus.js
rename to src/_h5ai/client/js/inc/ext/folderstatus.js
diff --git a/src/_h5ai/js/inc/ext/google-analytics.js b/src/_h5ai/client/js/inc/ext/google-analytics.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/google-analytics.js
rename to src/_h5ai/client/js/inc/ext/google-analytics.js
diff --git a/src/_h5ai/js/inc/ext/l10n.js b/src/_h5ai/client/js/inc/ext/l10n.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/l10n.js
rename to src/_h5ai/client/js/inc/ext/l10n.js
diff --git a/src/_h5ai/js/inc/ext/link-hover-states.js b/src/_h5ai/client/js/inc/ext/link-hover-states.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/link-hover-states.js
rename to src/_h5ai/client/js/inc/ext/link-hover-states.js
diff --git a/src/_h5ai/js/inc/ext/mode.js b/src/_h5ai/client/js/inc/ext/mode.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/mode.js
rename to src/_h5ai/client/js/inc/ext/mode.js
diff --git a/src/_h5ai/js/inc/ext/piwik-analytics.js b/src/_h5ai/client/js/inc/ext/piwik-analytics.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/piwik-analytics.js
rename to src/_h5ai/client/js/inc/ext/piwik-analytics.js
diff --git a/src/_h5ai/js/inc/ext/preview-img.js b/src/_h5ai/client/js/inc/ext/preview-img.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/preview-img.js
rename to src/_h5ai/client/js/inc/ext/preview-img.js
diff --git a/src/_h5ai/js/inc/ext/preview-txt.js b/src/_h5ai/client/js/inc/ext/preview-txt.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/preview-txt.js
rename to src/_h5ai/client/js/inc/ext/preview-txt.js
diff --git a/src/_h5ai/js/inc/ext/qrcode.js b/src/_h5ai/client/js/inc/ext/qrcode.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/qrcode.js
rename to src/_h5ai/client/js/inc/ext/qrcode.js
diff --git a/src/_h5ai/js/inc/ext/select.js b/src/_h5ai/client/js/inc/ext/select.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/select.js
rename to src/_h5ai/client/js/inc/ext/select.js
diff --git a/src/_h5ai/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/sort.js
rename to src/_h5ai/client/js/inc/ext/sort.js
diff --git a/src/_h5ai/js/inc/ext/statusbar.js b/src/_h5ai/client/js/inc/ext/statusbar.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/statusbar.js
rename to src/_h5ai/client/js/inc/ext/statusbar.js
diff --git a/src/_h5ai/js/inc/ext/thumbnails.js b/src/_h5ai/client/js/inc/ext/thumbnails.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/thumbnails.js
rename to src/_h5ai/client/js/inc/ext/thumbnails.js
diff --git a/src/_h5ai/js/inc/ext/title.js b/src/_h5ai/client/js/inc/ext/title.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/title.js
rename to src/_h5ai/client/js/inc/ext/title.js
diff --git a/src/_h5ai/js/inc/ext/tree.js b/src/_h5ai/client/js/inc/ext/tree.js
similarity index 100%
rename from src/_h5ai/js/inc/ext/tree.js
rename to src/_h5ai/client/js/inc/ext/tree.js
diff --git a/src/_h5ai/js/inc/h5ai-info.js b/src/_h5ai/client/js/inc/h5ai-info.js
similarity index 100%
rename from src/_h5ai/js/inc/h5ai-info.js
rename to src/_h5ai/client/js/inc/h5ai-info.js
diff --git a/src/_h5ai/js/inc/h5ai-main.js b/src/_h5ai/client/js/inc/h5ai-main.js
similarity index 100%
rename from src/_h5ai/js/inc/h5ai-main.js
rename to src/_h5ai/client/js/inc/h5ai-main.js
diff --git a/src/_h5ai/js/inc/model/entry.js b/src/_h5ai/client/js/inc/model/entry.js
similarity index 100%
rename from src/_h5ai/js/inc/model/entry.js
rename to src/_h5ai/client/js/inc/model/entry.js
diff --git a/src/_h5ai/js/inc/parser/apache-autoindex.js b/src/_h5ai/client/js/inc/parser/apache-autoindex.js
similarity index 100%
rename from src/_h5ai/js/inc/parser/apache-autoindex.js
rename to src/_h5ai/client/js/inc/parser/apache-autoindex.js
diff --git a/src/_h5ai/js/inc/parser/generic-json.js b/src/_h5ai/client/js/inc/parser/generic-json.js
similarity index 100%
rename from src/_h5ai/js/inc/parser/generic-json.js
rename to src/_h5ai/client/js/inc/parser/generic-json.js
diff --git a/src/_h5ai/js/inc/view/extended.js b/src/_h5ai/client/js/inc/view/extended.js
similarity index 100%
rename from src/_h5ai/js/inc/view/extended.js
rename to src/_h5ai/client/js/inc/view/extended.js
diff --git a/src/_h5ai/js/inc/view/spacing.js b/src/_h5ai/client/js/inc/view/spacing.js
similarity index 100%
rename from src/_h5ai/js/inc/view/spacing.js
rename to src/_h5ai/client/js/inc/view/spacing.js
diff --git a/src/_h5ai/js/inc/view/viewmode.js b/src/_h5ai/client/js/inc/view/viewmode.js
similarity index 100%
rename from src/_h5ai/js/inc/view/viewmode.js
rename to src/_h5ai/client/js/inc/view/viewmode.js
diff --git a/src/_h5ai/js/lib/amplify-1.1.0.js b/src/_h5ai/client/js/lib/amplify-1.1.0.js
similarity index 100%
rename from src/_h5ai/js/lib/amplify-1.1.0.js
rename to src/_h5ai/client/js/lib/amplify-1.1.0.js
diff --git a/src/_h5ai/js/lib/base64.js b/src/_h5ai/client/js/lib/base64.js
similarity index 100%
rename from src/_h5ai/js/lib/base64.js
rename to src/_h5ai/client/js/lib/base64.js
diff --git a/src/_h5ai/js/lib/jquery-1.8.2.js b/src/_h5ai/client/js/lib/jquery-1.8.2.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery-1.8.2.js
rename to src/_h5ai/client/js/lib/jquery-1.8.2.js
diff --git a/src/_h5ai/js/lib/jquery.filedrop-0.1.0.js b/src/_h5ai/client/js/lib/jquery.filedrop-0.1.0.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery.filedrop-0.1.0.js
rename to src/_h5ai/client/js/lib/jquery.filedrop-0.1.0.js
diff --git a/src/_h5ai/js/lib/jquery.fracs-0.11.js b/src/_h5ai/client/js/lib/jquery.fracs-0.11.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery.fracs-0.11.js
rename to src/_h5ai/client/js/lib/jquery.fracs-0.11.js
diff --git a/src/_h5ai/js/lib/jquery.mousewheel-3.0.6.js b/src/_h5ai/client/js/lib/jquery.mousewheel-3.0.6.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery.mousewheel-3.0.6.js
rename to src/_h5ai/client/js/lib/jquery.mousewheel-3.0.6.js
diff --git a/src/_h5ai/js/lib/jquery.qrcode-0.2.js b/src/_h5ai/client/js/lib/jquery.qrcode-0.2.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery.qrcode-0.2.js
rename to src/_h5ai/client/js/lib/jquery.qrcode-0.2.js
diff --git a/src/_h5ai/js/lib/jquery.scrollpanel-0.1.js b/src/_h5ai/client/js/lib/jquery.scrollpanel-0.1.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery.scrollpanel-0.1.js
rename to src/_h5ai/client/js/lib/jquery.scrollpanel-0.1.js
diff --git a/src/_h5ai/js/lib/jquery.spin-1.2.6.js b/src/_h5ai/client/js/lib/jquery.spin-1.2.6.js
similarity index 100%
rename from src/_h5ai/js/lib/jquery.spin-1.2.6.js
rename to src/_h5ai/client/js/lib/jquery.spin-1.2.6.js
diff --git a/src/_h5ai/js/lib/json2-2011.10.19.js b/src/_h5ai/client/js/lib/json2-2011.10.19.js
similarity index 100%
rename from src/_h5ai/js/lib/json2-2011.10.19.js
rename to src/_h5ai/client/js/lib/json2-2011.10.19.js
diff --git a/src/_h5ai/js/lib/markdown-0.4.0.js b/src/_h5ai/client/js/lib/markdown-0.4.0.js
similarity index 100%
rename from src/_h5ai/js/lib/markdown-0.4.0.js
rename to src/_h5ai/client/js/lib/markdown-0.4.0.js
diff --git a/src/_h5ai/js/lib/modernizr-2.6.2.js b/src/_h5ai/client/js/lib/modernizr-2.6.2.js
similarity index 100%
rename from src/_h5ai/js/lib/modernizr-2.6.2.js
rename to src/_h5ai/client/js/lib/modernizr-2.6.2.js
diff --git a/src/_h5ai/js/lib/modulejs-0.2.js b/src/_h5ai/client/js/lib/modulejs-0.2.js
similarity index 100%
rename from src/_h5ai/js/lib/modulejs-0.2.js
rename to src/_h5ai/client/js/lib/modulejs-0.2.js
diff --git a/src/_h5ai/js/lib/moment-1.7.2.js b/src/_h5ai/client/js/lib/moment-1.7.2.js
similarity index 100%
rename from src/_h5ai/js/lib/moment-1.7.2.js
rename to src/_h5ai/client/js/lib/moment-1.7.2.js
diff --git a/src/_h5ai/js/lib/sh/shBrushAS3.js b/src/_h5ai/client/js/lib/sh/shBrushAS3.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushAS3.js
rename to src/_h5ai/client/js/lib/sh/shBrushAS3.js
diff --git a/src/_h5ai/js/lib/sh/shBrushAppleScript.js b/src/_h5ai/client/js/lib/sh/shBrushAppleScript.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushAppleScript.js
rename to src/_h5ai/client/js/lib/sh/shBrushAppleScript.js
diff --git a/src/_h5ai/js/lib/sh/shBrushBash.js b/src/_h5ai/client/js/lib/sh/shBrushBash.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushBash.js
rename to src/_h5ai/client/js/lib/sh/shBrushBash.js
diff --git a/src/_h5ai/js/lib/sh/shBrushCSharp.js b/src/_h5ai/client/js/lib/sh/shBrushCSharp.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushCSharp.js
rename to src/_h5ai/client/js/lib/sh/shBrushCSharp.js
diff --git a/src/_h5ai/js/lib/sh/shBrushColdFusion.js b/src/_h5ai/client/js/lib/sh/shBrushColdFusion.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushColdFusion.js
rename to src/_h5ai/client/js/lib/sh/shBrushColdFusion.js
diff --git a/src/_h5ai/js/lib/sh/shBrushCpp.js b/src/_h5ai/client/js/lib/sh/shBrushCpp.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushCpp.js
rename to src/_h5ai/client/js/lib/sh/shBrushCpp.js
diff --git a/src/_h5ai/js/lib/sh/shBrushCss.js b/src/_h5ai/client/js/lib/sh/shBrushCss.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushCss.js
rename to src/_h5ai/client/js/lib/sh/shBrushCss.js
diff --git a/src/_h5ai/js/lib/sh/shBrushDelphi.js b/src/_h5ai/client/js/lib/sh/shBrushDelphi.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushDelphi.js
rename to src/_h5ai/client/js/lib/sh/shBrushDelphi.js
diff --git a/src/_h5ai/js/lib/sh/shBrushDiff.js b/src/_h5ai/client/js/lib/sh/shBrushDiff.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushDiff.js
rename to src/_h5ai/client/js/lib/sh/shBrushDiff.js
diff --git a/src/_h5ai/js/lib/sh/shBrushErlang.js b/src/_h5ai/client/js/lib/sh/shBrushErlang.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushErlang.js
rename to src/_h5ai/client/js/lib/sh/shBrushErlang.js
diff --git a/src/_h5ai/js/lib/sh/shBrushGroovy.js b/src/_h5ai/client/js/lib/sh/shBrushGroovy.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushGroovy.js
rename to src/_h5ai/client/js/lib/sh/shBrushGroovy.js
diff --git a/src/_h5ai/js/lib/sh/shBrushJScript.js b/src/_h5ai/client/js/lib/sh/shBrushJScript.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushJScript.js
rename to src/_h5ai/client/js/lib/sh/shBrushJScript.js
diff --git a/src/_h5ai/js/lib/sh/shBrushJava.js b/src/_h5ai/client/js/lib/sh/shBrushJava.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushJava.js
rename to src/_h5ai/client/js/lib/sh/shBrushJava.js
diff --git a/src/_h5ai/js/lib/sh/shBrushJavaFX.js b/src/_h5ai/client/js/lib/sh/shBrushJavaFX.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushJavaFX.js
rename to src/_h5ai/client/js/lib/sh/shBrushJavaFX.js
diff --git a/src/_h5ai/js/lib/sh/shBrushPerl.js b/src/_h5ai/client/js/lib/sh/shBrushPerl.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushPerl.js
rename to src/_h5ai/client/js/lib/sh/shBrushPerl.js
diff --git a/src/_h5ai/js/lib/sh/shBrushPhp.js b/src/_h5ai/client/js/lib/sh/shBrushPhp.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushPhp.js
rename to src/_h5ai/client/js/lib/sh/shBrushPhp.js
diff --git a/src/_h5ai/js/lib/sh/shBrushPlain.js b/src/_h5ai/client/js/lib/sh/shBrushPlain.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushPlain.js
rename to src/_h5ai/client/js/lib/sh/shBrushPlain.js
diff --git a/src/_h5ai/js/lib/sh/shBrushPowerShell.js b/src/_h5ai/client/js/lib/sh/shBrushPowerShell.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushPowerShell.js
rename to src/_h5ai/client/js/lib/sh/shBrushPowerShell.js
diff --git a/src/_h5ai/js/lib/sh/shBrushPython.js b/src/_h5ai/client/js/lib/sh/shBrushPython.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushPython.js
rename to src/_h5ai/client/js/lib/sh/shBrushPython.js
diff --git a/src/_h5ai/js/lib/sh/shBrushRuby.js b/src/_h5ai/client/js/lib/sh/shBrushRuby.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushRuby.js
rename to src/_h5ai/client/js/lib/sh/shBrushRuby.js
diff --git a/src/_h5ai/js/lib/sh/shBrushSass.js b/src/_h5ai/client/js/lib/sh/shBrushSass.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushSass.js
rename to src/_h5ai/client/js/lib/sh/shBrushSass.js
diff --git a/src/_h5ai/js/lib/sh/shBrushScala.js b/src/_h5ai/client/js/lib/sh/shBrushScala.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushScala.js
rename to src/_h5ai/client/js/lib/sh/shBrushScala.js
diff --git a/src/_h5ai/js/lib/sh/shBrushSql.js b/src/_h5ai/client/js/lib/sh/shBrushSql.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushSql.js
rename to src/_h5ai/client/js/lib/sh/shBrushSql.js
diff --git a/src/_h5ai/js/lib/sh/shBrushVb.js b/src/_h5ai/client/js/lib/sh/shBrushVb.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushVb.js
rename to src/_h5ai/client/js/lib/sh/shBrushVb.js
diff --git a/src/_h5ai/js/lib/sh/shBrushXml.js b/src/_h5ai/client/js/lib/sh/shBrushXml.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shBrushXml.js
rename to src/_h5ai/client/js/lib/sh/shBrushXml.js
diff --git a/src/_h5ai/js/lib/sh/shCore.js b/src/_h5ai/client/js/lib/sh/shCore.js
similarity index 100%
rename from src/_h5ai/js/lib/sh/shCore.js
rename to src/_h5ai/client/js/lib/sh/shCore.js
diff --git a/src/_h5ai/js/lib/spin-1.2.7.js b/src/_h5ai/client/js/lib/spin-1.2.7.js
similarity index 100%
rename from src/_h5ai/js/lib/spin-1.2.7.js
rename to src/_h5ai/client/js/lib/spin-1.2.7.js
diff --git a/src/_h5ai/js/lib/underscore-1.4.1.js b/src/_h5ai/client/js/lib/underscore-1.4.1.js
similarity index 100%
rename from src/_h5ai/js/lib/underscore-1.4.1.js
rename to src/_h5ai/client/js/lib/underscore-1.4.1.js
diff --git a/src/_h5ai/js/markdown.js b/src/_h5ai/client/js/markdown.js
similarity index 100%
rename from src/_h5ai/js/markdown.js
rename to src/_h5ai/client/js/markdown.js
diff --git a/src/_h5ai/js/scripts.js b/src/_h5ai/client/js/scripts.js
similarity index 98%
rename from src/_h5ai/js/scripts.js
rename to src/_h5ai/client/js/scripts.js
index 21ca662c..bd806011 100644
--- a/src/_h5ai/js/scripts.js
+++ b/src/_h5ai/client/js/scripts.js
@@ -23,7 +23,7 @@
 	// @include "inc/**/*.js"
 
 	var	$scriptTag = $('script[src$="scripts.js"]'),
-		globalConfigHref = $scriptTag.attr('src').replace(/scripts.js$/, '../config.json'),
+		globalConfigHref = $scriptTag.attr('src').replace(/scripts.js$/, '../../conf/config.json'),
 		localConfigHref = $scriptTag.data('config') || './_h5ai.config.json',
 
 		parse = function (response) {
diff --git a/src/_h5ai/js/syntaxhighlighter.js b/src/_h5ai/client/js/syntaxhighlighter.js
similarity index 100%
rename from src/_h5ai/js/syntaxhighlighter.js
rename to src/_h5ai/client/js/syntaxhighlighter.js
diff --git a/src/_h5ai/config.json b/src/_h5ai/conf/config.json
similarity index 100%
rename from src/_h5ai/config.json
rename to src/_h5ai/conf/config.json
diff --git a/src/_h5ai/config.php b/src/_h5ai/conf/config.php
similarity index 100%
rename from src/_h5ai/config.php
rename to src/_h5ai/conf/config.php
diff --git a/src/_h5ai/l10n/bg.json b/src/_h5ai/conf/l10n/bg.json
similarity index 100%
rename from src/_h5ai/l10n/bg.json
rename to src/_h5ai/conf/l10n/bg.json
diff --git a/src/_h5ai/l10n/cs.json b/src/_h5ai/conf/l10n/cs.json
similarity index 100%
rename from src/_h5ai/l10n/cs.json
rename to src/_h5ai/conf/l10n/cs.json
diff --git a/src/_h5ai/l10n/de.json b/src/_h5ai/conf/l10n/de.json
similarity index 100%
rename from src/_h5ai/l10n/de.json
rename to src/_h5ai/conf/l10n/de.json
diff --git a/src/_h5ai/l10n/el.json b/src/_h5ai/conf/l10n/el.json
similarity index 100%
rename from src/_h5ai/l10n/el.json
rename to src/_h5ai/conf/l10n/el.json
diff --git a/src/_h5ai/l10n/en.json b/src/_h5ai/conf/l10n/en.json
similarity index 100%
rename from src/_h5ai/l10n/en.json
rename to src/_h5ai/conf/l10n/en.json
diff --git a/src/_h5ai/l10n/es.json b/src/_h5ai/conf/l10n/es.json
similarity index 100%
rename from src/_h5ai/l10n/es.json
rename to src/_h5ai/conf/l10n/es.json
diff --git a/src/_h5ai/l10n/fr.json b/src/_h5ai/conf/l10n/fr.json
similarity index 100%
rename from src/_h5ai/l10n/fr.json
rename to src/_h5ai/conf/l10n/fr.json
diff --git a/src/_h5ai/l10n/he.json b/src/_h5ai/conf/l10n/he.json
similarity index 100%
rename from src/_h5ai/l10n/he.json
rename to src/_h5ai/conf/l10n/he.json
diff --git a/src/_h5ai/l10n/hu.json b/src/_h5ai/conf/l10n/hu.json
similarity index 100%
rename from src/_h5ai/l10n/hu.json
rename to src/_h5ai/conf/l10n/hu.json
diff --git a/src/_h5ai/l10n/it.json b/src/_h5ai/conf/l10n/it.json
similarity index 100%
rename from src/_h5ai/l10n/it.json
rename to src/_h5ai/conf/l10n/it.json
diff --git a/src/_h5ai/l10n/ja.json b/src/_h5ai/conf/l10n/ja.json
similarity index 100%
rename from src/_h5ai/l10n/ja.json
rename to src/_h5ai/conf/l10n/ja.json
diff --git a/src/_h5ai/l10n/lv.json b/src/_h5ai/conf/l10n/lv.json
similarity index 100%
rename from src/_h5ai/l10n/lv.json
rename to src/_h5ai/conf/l10n/lv.json
diff --git a/src/_h5ai/l10n/nb.json b/src/_h5ai/conf/l10n/nb.json
similarity index 100%
rename from src/_h5ai/l10n/nb.json
rename to src/_h5ai/conf/l10n/nb.json
diff --git a/src/_h5ai/l10n/nl.json b/src/_h5ai/conf/l10n/nl.json
similarity index 100%
rename from src/_h5ai/l10n/nl.json
rename to src/_h5ai/conf/l10n/nl.json
diff --git a/src/_h5ai/l10n/pl.json b/src/_h5ai/conf/l10n/pl.json
similarity index 100%
rename from src/_h5ai/l10n/pl.json
rename to src/_h5ai/conf/l10n/pl.json
diff --git a/src/_h5ai/l10n/pt.json b/src/_h5ai/conf/l10n/pt.json
similarity index 100%
rename from src/_h5ai/l10n/pt.json
rename to src/_h5ai/conf/l10n/pt.json
diff --git a/src/_h5ai/l10n/ro.json b/src/_h5ai/conf/l10n/ro.json
similarity index 100%
rename from src/_h5ai/l10n/ro.json
rename to src/_h5ai/conf/l10n/ro.json
diff --git a/src/_h5ai/l10n/ru.json b/src/_h5ai/conf/l10n/ru.json
similarity index 100%
rename from src/_h5ai/l10n/ru.json
rename to src/_h5ai/conf/l10n/ru.json
diff --git a/src/_h5ai/l10n/sk.json b/src/_h5ai/conf/l10n/sk.json
similarity index 100%
rename from src/_h5ai/l10n/sk.json
rename to src/_h5ai/conf/l10n/sk.json
diff --git a/src/_h5ai/l10n/sr.json b/src/_h5ai/conf/l10n/sr.json
similarity index 100%
rename from src/_h5ai/l10n/sr.json
rename to src/_h5ai/conf/l10n/sr.json
diff --git a/src/_h5ai/l10n/sv.json b/src/_h5ai/conf/l10n/sv.json
similarity index 100%
rename from src/_h5ai/l10n/sv.json
rename to src/_h5ai/conf/l10n/sv.json
diff --git a/src/_h5ai/l10n/tr.json b/src/_h5ai/conf/l10n/tr.json
similarity index 100%
rename from src/_h5ai/l10n/tr.json
rename to src/_h5ai/conf/l10n/tr.json
diff --git a/src/_h5ai/l10n/zh-cn.json b/src/_h5ai/conf/l10n/zh-cn.json
similarity index 100%
rename from src/_h5ai/l10n/zh-cn.json
rename to src/_h5ai/conf/l10n/zh-cn.json
diff --git a/src/_h5ai/l10n/zh-tw.json b/src/_h5ai/conf/l10n/zh-tw.json
similarity index 100%
rename from src/_h5ai/l10n/zh-tw.json
rename to src/_h5ai/conf/l10n/zh-tw.json
diff --git a/src/_h5ai/images/h5ai-16x16.png b/src/_h5ai/images/h5ai-16x16.png
deleted file mode 100644
index 7c613e05..00000000
Binary files a/src/_h5ai/images/h5ai-16x16.png and /dev/null differ
diff --git a/src/_h5ai/apache/autoindex.htaccess b/src/_h5ai/server/aai/aai.htaccess
similarity index 69%
rename from src/_h5ai/apache/autoindex.htaccess
rename to src/_h5ai/server/aai/aai.htaccess
index 05604834..497f7381 100644
--- a/src/_h5ai/apache/autoindex.htaccess
+++ b/src/_h5ai/server/aai/aai.htaccess
@@ -6,10 +6,10 @@
 Options       +Indexes
 Options       +FollowSymLinks
 
-HeaderName    /_h5ai/apache/h5ai-header.html
-ReadmeName    /_h5ai/apache/h5ai-footer.html
+HeaderName    /_{{pkg.name}}/server/aai/header.html
+ReadmeName    /_{{pkg.name}}/server/aai/footer.html
 
-IndexIgnore   _h5ai*
+IndexIgnore   _{{pkg.name}}*
 
 IndexOptions  Charset=UTF-8
 IndexOptions  FancyIndexing
@@ -19,5 +19,5 @@ IndexOptions  NameWidth=*
 IndexOptions  SuppressDescription
 IndexOptions  SuppressHTMLPreamble
 IndexOptions  SuppressRules
-IndexOptions  Type=text/html;h5ai={{pkg.version}}
+IndexOptions  Type=text/html;{{pkg.name}}={{pkg.version}}
 IndexOptions  XHTML
diff --git a/src/_h5ai/apache/h5ai-footer.html.jade b/src/_h5ai/server/aai/footer.html.jade
similarity index 100%
rename from src/_h5ai/apache/h5ai-footer.html.jade
rename to src/_h5ai/server/aai/footer.html.jade
diff --git a/src/_h5ai/apache/h5ai-header.html.jade b/src/_h5ai/server/aai/header.html.jade
similarity index 60%
rename from src/_h5ai/apache/h5ai-header.html.jade
rename to src/_h5ai/server/aai/header.html.jade
index dc38780e..216139c6 100644
--- a/src/_h5ai/apache/h5ai-header.html.jade
+++ b/src/_h5ai/server/aai/header.html.jade
@@ -1,5 +1,5 @@
 
-- var h5ai = "/_h5ai/"
+- var appHref = "/_{{pkg.name}}/client"
 
 doctype 5
 //if lt IE 9
@@ -12,13 +12,13 @@ head
 	meta( charset="utf-8" )
 	meta( http-equiv="X-UA-Compatible", content="IE=edge,chrome=1" )
 	title Directory index · styled with {{pkg.name}} {{pkg.version}}
-	meta( name="description", content="Directory index styled with h5ai {{pkg.version}} (http://larsjung.de/h5ai)" )
+	meta( name="description", content="Directory index styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
 	meta( name="viewport", content="width=device-width" )
-	link( rel="shortcut icon", href!="#{h5ai}images/h5ai-16x16.ico" )
-	link( rel="apple-touch-icon", type="image/png", href!="#{h5ai}images/h5ai-48x48.png" )
+	link( rel="shortcut icon", href="#{appHref}/images/app-16x16.ico" )
+	link( rel="apple-touch-icon", type="image/png", href="#{appHref}/images/app-48x48.png" )
 	link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" )
-	link( rel="stylesheet", href!="#{h5ai}css/styles.css" )
-	script( src!="#{h5ai}js/scripts.js" )
+	link( rel="stylesheet", href="#{appHref}/css/styles.css" )
+	script( src="#{appHref}/js/scripts.js" )
 
 |<body id="h5ai-main">
 
@@ -30,8 +30,10 @@ div#content
 
 div#bottombar.clearfix
 	span.left
-		a#h5ai-reference( href="http://larsjung.de/h5ai", title="h5ai project page" ) {{pkg.name}} {{pkg.version}}
-		span.hideOnJs.noJsMsg ⚡ JavaScript is disabled! ⚡
+		a#h5ai-reference( href="{{pkg.url}}", title="{{pkg.name}} project page" )
+			| {{pkg.name}} {{pkg.version}}
+		span.hideOnJs.noJsMsg
+			| ⚡ JavaScript is disabled! ⚡
 		span.oldBrowser
 			| ⚡ Some features disabled! Works best in 
 			a( href="http://browsehappy.com" ) modern browsers
@@ -40,4 +42,4 @@ div#bottombar.clearfix
 	span.center
 
 |<div id="data-apache-autoindex" class="hideOnJs">
-// The following code was generated by Apache's autoindex module. It is not valid HTML5, but gets removed from the DOM tree as soon as possible. The actual page should render as valid HTML5.
+// The following code was generated by Apache's autoindex module.
diff --git a/src/_h5ai/php/api.php b/src/_h5ai/server/php/api.php
similarity index 98%
rename from src/_h5ai/php/api.php
rename to src/_h5ai/server/php/api.php
index 1614abc3..22174d61 100644
--- a/src/_h5ai/php/api.php
+++ b/src/_h5ai/server/php/api.php
@@ -44,7 +44,7 @@ if ($action === "getthumbsrc") {
 		json_fail(1, "thumbnails disabled");
 	}
 
-	H5ai::req_once("/php/inc/Thumb.php");
+	H5ai::req_once("/server/php/inc/Thumb.php");
 	if (!Thumb::is_supported()) {
 		json_fail(2, "thumbnails not supported");
 	}
@@ -67,7 +67,7 @@ else if ($action === "archive") {
 
 	list($execution, $format, $hrefs) = check_keys(array("execution", "format", "hrefs"));
 
-	H5ai::req_once("/php/inc/Archive.php");
+	H5ai::req_once("/server/php/inc/Archive.php");
 	$archive = new Archive($h5ai);
 
 	$hrefs = explode(":", trim($hrefs));
diff --git a/src/_h5ai/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php
similarity index 100%
rename from src/_h5ai/php/inc/Archive.php
rename to src/_h5ai/server/php/inc/Archive.php
diff --git a/src/_h5ai/php/inc/Entry.php b/src/_h5ai/server/php/inc/Entry.php
similarity index 100%
rename from src/_h5ai/php/inc/Entry.php
rename to src/_h5ai/server/php/inc/Entry.php
diff --git a/src/_h5ai/php/inc/H5ai.php b/src/_h5ai/server/php/inc/H5ai.php
similarity index 97%
rename from src/_h5ai/php/inc/H5ai.php
rename to src/_h5ai/server/php/inc/H5ai.php
index f785bd6c..c0ad6bd4 100644
--- a/src/_h5ai/php/inc/H5ai.php
+++ b/src/_h5ai/server/php/inc/H5ai.php
@@ -1,11 +1,11 @@
 <?php
 
 
-define("H5AI_ABS_PATH", H5ai::normalize_path(dirname(dirname(dirname(__FILE__)))));
+define("H5AI_ABS_PATH", H5ai::normalize_path(dirname(dirname(dirname(dirname(__FILE__))))));
 
 
-H5ai::req_once("/config.php");
-H5ai::req_once("/php/inc/Entry.php");
+H5ai::req_once("/conf/config.php");
+H5ai::req_once("/server/php/inc/Entry.php");
 
 
 class H5ai {
@@ -77,7 +77,7 @@ class H5ai {
 		$this->index_files = $H5AI_CONFIG["INDEX_FILES"];
 
 		$this->config = array("options" => array(), "types" => array(), "langs" => array());
-		$this->config = H5ai::merge_config($this->config, H5ai::load_config($this->h5aiAbsPath . "/config.json"));
+		$this->config = H5ai::merge_config($this->config, H5ai::load_config($this->h5aiAbsPath . "/conf/config.json"));
 		$this->options = $this->config["options"];
 
 		$this->h5aiAbsHref = H5ai::normalize_path($this->options["h5aiAbsHref"], true);
@@ -292,7 +292,7 @@ class H5ai {
 		$footer = $this->fileExists($footer ? $this->absPath . "/" . $footer : null) ? $footer : null;
 
 		$json = array(
-			"id" => $this->requested_from === $this->h5aiAbsPath . "/php/h5ai-index.php" ? "php" : "idx.php",
+			"id" => $this->requested_from === $this->h5aiAbsPath . "/server/php/index.php" ? "php" : "idx.php",
 			"serverName" => strtolower(preg_replace("/\\/.*$/", "", getenv("SERVER_SOFTWARE"))),
 			"serverVersion" => strtolower(preg_replace("/^.*\\//", "", preg_replace("/\\s.*$/", "", getenv("SERVER_SOFTWARE")))),
 			"customHeader" => $header,
diff --git a/src/_h5ai/php/inc/Thumb.php b/src/_h5ai/server/php/inc/Thumb.php
similarity index 100%
rename from src/_h5ai/php/inc/Thumb.php
rename to src/_h5ai/server/php/inc/Thumb.php
diff --git a/src/_h5ai/php/h5ai-index.php.jade b/src/_h5ai/server/php/index.php.jade
similarity index 72%
rename from src/_h5ai/php/h5ai-index.php.jade
rename to src/_h5ai/server/php/index.php.jade
index 2e3fc55d..dfc4e137 100644
--- a/src/_h5ai/php/h5ai-index.php.jade
+++ b/src/_h5ai/server/php/index.php.jade
@@ -1,5 +1,5 @@
 |<?php
-|	header("Content-type: text/html;h5ai={{pkg.version}}");
+|	header("Content-type: text/html;{{pkg.name}}={{pkg.version}}");
 |	$h5ai_php = str_replace("\\", "/", dirname(__FILE__)) . "/inc/H5ai.php";
 |	if (!file_exists($h5ai_php)) {
 |		function find_h5ai($path, $h5ai) {
@@ -8,7 +8,7 @@
 |			if ($parent !== $path) { return find_h5ai($parent, $h5ai); }
 |			error_log("h5ai not found: " . __FILE__);
 |		}
-|		$h5ai_php = find_h5ai(str_replace("\\", "/", dirname(__FILE__)), "/_h5ai/php/inc/H5ai.php");
+|		$h5ai_php = find_h5ai(str_replace("\\", "/", dirname(__FILE__)), "/_{{pkg.name}}/server/php/inc/H5ai.php");
 |	}
 |	require_once($h5ai_php);
 |	$h5ai = new H5ai(__FILE__);
@@ -16,7 +16,7 @@
 |	$isHeadRequest = stripos($_SERVER["REQUEST_METHOD"], "HEAD");
 |?>
 
-- var h5ai = "<?php echo $h5aiAbsHref; ?>"
+- var appHref = "<?php echo $h5aiAbsHref; ?>client"
 - var json = "<?php if (!$isHeadRequest) { echo $h5ai->getGenericJson(); }?>"
 - var fallback = "<?php if (!$isHeadRequest) { echo $h5ai->getNoJsFallback(); }?>"
 - var config = "<?php if (!$isHeadRequest) { echo $h5ai->getCustomConfig(); }?>"
@@ -32,13 +32,13 @@ html.no-js( lang="en" )
 		meta( charset="utf-8" )
 		meta( http-equiv="X-UA-Compatible", content="IE=edge,chrome=1" )
 		title Directory index · styled with {{pkg.name}} {{pkg.version}}
-		meta( name="description", content="Directory index styled with h5ai {{pkg.version}} (http://larsjung.de/h5ai)" )
+		meta( name="description", content="Directory index styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
 		meta( name="viewport", content="width=device-width" )
-		link( rel="shortcut icon", href!="#{h5ai}images/h5ai-16x16.ico" )
-		link( rel="apple-touch-icon", type="image/png", href!="#{h5ai}images/h5ai-48x48.png" )
+		link( rel="shortcut icon", href!="#{appHref}/images/app-16x16.ico" )
+		link( rel="apple-touch-icon", type="image/png", href!="#{appHref}/images/app-48x48.png" )
 		link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic" )
-		link( rel="stylesheet", href!="#{h5ai}css/styles.css" )
-		script( src!="#{h5ai}js/scripts.js", data-config!="#{config}" )
+		link( rel="stylesheet", href!="#{appHref}/css/styles.css" )
+		script( src!="#{appHref}/js/scripts.js", data-config!="#{config}" )
 
 	body#h5ai-main
 
@@ -50,8 +50,10 @@ html.no-js( lang="en" )
 
 		div#bottombar.clearfix
 			span.left
-				a#h5ai-reference( href="http://larsjung.de/h5ai", title="h5ai project page" ) {{pkg.name}} {{pkg.version}}
-				span.hideOnJs.noJsMsg ⚡ JavaScript is disabled! ⚡
+				a#h5ai-reference( href="{{pkg.url}}", title="{{pkg.name}} project page" )
+					| {{pkg.name}} {{pkg.version}}
+				span.hideOnJs.noJsMsg
+					| ⚡ JavaScript is disabled! ⚡
 				span.oldBrowser
 					| ⚡ Some features disabled! Works best in 
 					a( href="http://browsehappy.com" ) modern browsers