diff --git a/.classpath b/client/.classpath
similarity index 100%
rename from .classpath
rename to client/.classpath
diff --git a/.gitattributes b/client/.gitattributes
similarity index 100%
rename from .gitattributes
rename to client/.gitattributes
diff --git a/.gitignore b/client/.gitignore
similarity index 100%
rename from .gitignore
rename to client/.gitignore
diff --git a/.project b/client/.project
similarity index 100%
rename from .project
rename to client/.project
diff --git a/.settings/org.eclipse.core.resources.prefs b/client/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from .settings/org.eclipse.core.resources.prefs
rename to client/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/client/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.core.prefs
rename to client/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/client/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from .settings/org.eclipse.m2e.core.prefs
rename to client/.settings/org.eclipse.m2e.core.prefs
diff --git a/CHANGELOG.md b/client/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to client/CHANGELOG.md
diff --git a/LICENSE.txt b/client/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to client/LICENSE.txt
diff --git a/README.md b/client/README.md
similarity index 100%
rename from README.md
rename to client/README.md
diff --git a/build.sh b/client/build.sh
similarity index 100%
rename from build.sh
rename to client/build.sh
diff --git a/docs/.gitignore b/client/docs/.gitignore
similarity index 100%
rename from docs/.gitignore
rename to client/docs/.gitignore
diff --git a/docs/.travis.yml b/client/docs/.travis.yml
similarity index 100%
rename from docs/.travis.yml
rename to client/docs/.travis.yml
diff --git a/docs/LICENSE b/client/docs/LICENSE
similarity index 100%
rename from docs/LICENSE
rename to client/docs/LICENSE
diff --git a/docs/TEMPLATE.md b/client/docs/TEMPLATE.md
similarity index 100%
rename from docs/TEMPLATE.md
rename to client/docs/TEMPLATE.md
diff --git a/docs/css/freelancer.css b/client/docs/css/freelancer.css
similarity index 100%
rename from docs/css/freelancer.css
rename to client/docs/css/freelancer.css
diff --git a/docs/css/freelancer.min.css b/client/docs/css/freelancer.min.css
similarity index 100%
rename from docs/css/freelancer.min.css
rename to client/docs/css/freelancer.min.css
diff --git a/docs/gulpfile.js b/client/docs/gulpfile.js
similarity index 100%
rename from docs/gulpfile.js
rename to client/docs/gulpfile.js
diff --git a/docs/img/buymeacoffee/.DS_Store b/client/docs/img/buymeacoffee/.DS_Store
similarity index 100%
rename from docs/img/buymeacoffee/.DS_Store
rename to client/docs/img/buymeacoffee/.DS_Store
diff --git a/docs/img/buymeacoffee/Button/.DS_Store b/client/docs/img/buymeacoffee/Button/.DS_Store
similarity index 100%
rename from docs/img/buymeacoffee/Button/.DS_Store
rename to client/docs/img/buymeacoffee/Button/.DS_Store
diff --git a/docs/img/buymeacoffee/Button/Button-gif.gif b/client/docs/img/buymeacoffee/Button/Button-gif.gif
similarity index 100%
rename from docs/img/buymeacoffee/Button/Button-gif.gif
rename to client/docs/img/buymeacoffee/Button/Button-gif.gif
diff --git a/docs/img/buymeacoffee/Button/Button-orange.png b/client/docs/img/buymeacoffee/Button/Button-orange.png
similarity index 100%
rename from docs/img/buymeacoffee/Button/Button-orange.png
rename to client/docs/img/buymeacoffee/Button/Button-orange.png
diff --git a/docs/img/buymeacoffee/Button/Button_yellow.png b/client/docs/img/buymeacoffee/Button/Button_yellow.png
similarity index 100%
rename from docs/img/buymeacoffee/Button/Button_yellow.png
rename to client/docs/img/buymeacoffee/Button/Button_yellow.png
diff --git a/docs/img/buymeacoffee/Button/button-red.png b/client/docs/img/buymeacoffee/Button/button-red.png
similarity index 100%
rename from docs/img/buymeacoffee/Button/button-red.png
rename to client/docs/img/buymeacoffee/Button/button-red.png
diff --git a/docs/img/buymeacoffee/Button/button-red.svg b/client/docs/img/buymeacoffee/Button/button-red.svg
similarity index 100%
rename from docs/img/buymeacoffee/Button/button-red.svg
rename to client/docs/img/buymeacoffee/Button/button-red.svg
diff --git a/docs/img/buymeacoffee/Collection.eps b/client/docs/img/buymeacoffee/Collection.eps
similarity index 100%
rename from docs/img/buymeacoffee/Collection.eps
rename to client/docs/img/buymeacoffee/Collection.eps
diff --git a/docs/img/buymeacoffee/Logo_Editable.ai b/client/docs/img/buymeacoffee/Logo_Editable.ai
similarity index 100%
rename from docs/img/buymeacoffee/Logo_Editable.ai
rename to client/docs/img/buymeacoffee/Logo_Editable.ai
diff --git a/docs/img/buymeacoffee/Logo_black-vector.eps b/client/docs/img/buymeacoffee/Logo_black-vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Logo_black-vector.eps
rename to client/docs/img/buymeacoffee/Logo_black-vector.eps
diff --git a/docs/img/buymeacoffee/Logo_orange-vector.eps b/client/docs/img/buymeacoffee/Logo_orange-vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Logo_orange-vector.eps
rename to client/docs/img/buymeacoffee/Logo_orange-vector.eps
diff --git a/docs/img/buymeacoffee/Logo_transparent_vector.eps b/client/docs/img/buymeacoffee/Logo_transparent_vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Logo_transparent_vector.eps
rename to client/docs/img/buymeacoffee/Logo_transparent_vector.eps
diff --git a/docs/img/buymeacoffee/Logo_yellow_vector.eps b/client/docs/img/buymeacoffee/Logo_yellow_vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Logo_yellow_vector.eps
rename to client/docs/img/buymeacoffee/Logo_yellow_vector.eps
diff --git a/docs/img/buymeacoffee/Wordmark-yellow_vector.eps b/client/docs/img/buymeacoffee/Wordmark-yellow_vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Wordmark-yellow_vector.eps
rename to client/docs/img/buymeacoffee/Wordmark-yellow_vector.eps
diff --git a/docs/img/buymeacoffee/Wordmark_black_vector.eps b/client/docs/img/buymeacoffee/Wordmark_black_vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Wordmark_black_vector.eps
rename to client/docs/img/buymeacoffee/Wordmark_black_vector.eps
diff --git a/docs/img/buymeacoffee/Wordmark_orange_vector.eps b/client/docs/img/buymeacoffee/Wordmark_orange_vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Wordmark_orange_vector.eps
rename to client/docs/img/buymeacoffee/Wordmark_orange_vector.eps
diff --git a/docs/img/buymeacoffee/Wordmark_vector.eps b/client/docs/img/buymeacoffee/Wordmark_vector.eps
similarity index 100%
rename from docs/img/buymeacoffee/Wordmark_vector.eps
rename to client/docs/img/buymeacoffee/Wordmark_vector.eps
diff --git a/docs/img/buymeacoffee/buymeacoffee-fancy.png b/client/docs/img/buymeacoffee/buymeacoffee-fancy.png
similarity index 100%
rename from docs/img/buymeacoffee/buymeacoffee-fancy.png
rename to client/docs/img/buymeacoffee/buymeacoffee-fancy.png
diff --git a/docs/img/buymeacoffee/buymeacoffee-fancy.svg b/client/docs/img/buymeacoffee/buymeacoffee-fancy.svg
similarity index 100%
rename from docs/img/buymeacoffee/buymeacoffee-fancy.svg
rename to client/docs/img/buymeacoffee/buymeacoffee-fancy.svg
diff --git a/docs/img/buymeacoffee/buymeacoffee.png b/client/docs/img/buymeacoffee/buymeacoffee.png
similarity index 100%
rename from docs/img/buymeacoffee/buymeacoffee.png
rename to client/docs/img/buymeacoffee/buymeacoffee.png
diff --git a/docs/img/buymeacoffee/buymeacoffee.svg b/client/docs/img/buymeacoffee/buymeacoffee.svg
similarity index 100%
rename from docs/img/buymeacoffee/buymeacoffee.svg
rename to client/docs/img/buymeacoffee/buymeacoffee.svg
diff --git a/docs/img/favicon.png b/client/docs/img/favicon.png
similarity index 100%
rename from docs/img/favicon.png
rename to client/docs/img/favicon.png
diff --git a/docs/img/featured-s.jpg b/client/docs/img/featured-s.jpg
similarity index 100%
rename from docs/img/featured-s.jpg
rename to client/docs/img/featured-s.jpg
diff --git a/docs/img/featured.jpg b/client/docs/img/featured.jpg
similarity index 100%
rename from docs/img/featured.jpg
rename to client/docs/img/featured.jpg
diff --git a/docs/img/featured.png b/client/docs/img/featured.png
similarity index 100%
rename from docs/img/featured.png
rename to client/docs/img/featured.png
diff --git a/docs/img/followed.jpg b/client/docs/img/followed.jpg
similarity index 100%
rename from docs/img/followed.jpg
rename to client/docs/img/followed.jpg
diff --git a/docs/img/followed.png b/client/docs/img/followed.png
similarity index 100%
rename from docs/img/followed.png
rename to client/docs/img/followed.png
diff --git a/docs/img/portfolio/cabin.png b/client/docs/img/portfolio/cabin.png
similarity index 100%
rename from docs/img/portfolio/cabin.png
rename to client/docs/img/portfolio/cabin.png
diff --git a/docs/img/portfolio/cake.png b/client/docs/img/portfolio/cake.png
similarity index 100%
rename from docs/img/portfolio/cake.png
rename to client/docs/img/portfolio/cake.png
diff --git a/docs/img/portfolio/circus.png b/client/docs/img/portfolio/circus.png
similarity index 100%
rename from docs/img/portfolio/circus.png
rename to client/docs/img/portfolio/circus.png
diff --git a/docs/img/portfolio/game.png b/client/docs/img/portfolio/game.png
similarity index 100%
rename from docs/img/portfolio/game.png
rename to client/docs/img/portfolio/game.png
diff --git a/docs/img/portfolio/safe.png b/client/docs/img/portfolio/safe.png
similarity index 100%
rename from docs/img/portfolio/safe.png
rename to client/docs/img/portfolio/safe.png
diff --git a/docs/img/portfolio/submarine.png b/client/docs/img/portfolio/submarine.png
similarity index 100%
rename from docs/img/portfolio/submarine.png
rename to client/docs/img/portfolio/submarine.png
diff --git a/docs/img/profile.png b/client/docs/img/profile.png
similarity index 100%
rename from docs/img/profile.png
rename to client/docs/img/profile.png
diff --git a/docs/img/recording.jpg b/client/docs/img/recording.jpg
similarity index 100%
rename from docs/img/recording.jpg
rename to client/docs/img/recording.jpg
diff --git a/docs/img/recording.png b/client/docs/img/recording.png
similarity index 100%
rename from docs/img/recording.png
rename to client/docs/img/recording.png
diff --git a/docs/img/recordings.jpg b/client/docs/img/recordings.jpg
similarity index 100%
rename from docs/img/recordings.jpg
rename to client/docs/img/recordings.jpg
diff --git a/docs/img/recordings.png b/client/docs/img/recordings.png
similarity index 100%
rename from docs/img/recordings.png
rename to client/docs/img/recordings.png
diff --git a/docs/img/server.png b/client/docs/img/server.png
similarity index 100%
rename from docs/img/server.png
rename to client/docs/img/server.png
diff --git a/docs/img/settings.jpg b/client/docs/img/settings.jpg
similarity index 100%
rename from docs/img/settings.jpg
rename to client/docs/img/settings.jpg
diff --git a/docs/img/settings.png b/client/docs/img/settings.png
similarity index 100%
rename from docs/img/settings.png
rename to client/docs/img/settings.png
diff --git a/docs/img/token.png b/client/docs/img/token.png
similarity index 100%
rename from docs/img/token.png
rename to client/docs/img/token.png
diff --git a/docs/index.html b/client/docs/index.html
similarity index 100%
rename from docs/index.html
rename to client/docs/index.html
diff --git a/docs/js/contact_me.js b/client/docs/js/contact_me.js
similarity index 100%
rename from docs/js/contact_me.js
rename to client/docs/js/contact_me.js
diff --git a/docs/js/contact_me.min.js b/client/docs/js/contact_me.min.js
similarity index 100%
rename from docs/js/contact_me.min.js
rename to client/docs/js/contact_me.min.js
diff --git a/docs/js/freelancer.js b/client/docs/js/freelancer.js
similarity index 100%
rename from docs/js/freelancer.js
rename to client/docs/js/freelancer.js
diff --git a/docs/js/freelancer.min.js b/client/docs/js/freelancer.min.js
similarity index 100%
rename from docs/js/freelancer.min.js
rename to client/docs/js/freelancer.min.js
diff --git a/docs/js/jqBootstrapValidation.js b/client/docs/js/jqBootstrapValidation.js
similarity index 100%
rename from docs/js/jqBootstrapValidation.js
rename to client/docs/js/jqBootstrapValidation.js
diff --git a/docs/js/jqBootstrapValidation.min.js b/client/docs/js/jqBootstrapValidation.min.js
similarity index 100%
rename from docs/js/jqBootstrapValidation.min.js
rename to client/docs/js/jqBootstrapValidation.min.js
diff --git a/docs/mail/contact_me.php b/client/docs/mail/contact_me.php
similarity index 100%
rename from docs/mail/contact_me.php
rename to client/docs/mail/contact_me.php
diff --git a/docs/package-lock.json b/client/docs/package-lock.json
similarity index 100%
rename from docs/package-lock.json
rename to client/docs/package-lock.json
diff --git a/docs/package.json b/client/docs/package.json
similarity index 100%
rename from docs/package.json
rename to client/docs/package.json
diff --git a/docs/scss/_bootstrap-overrides.scss b/client/docs/scss/_bootstrap-overrides.scss
similarity index 100%
rename from docs/scss/_bootstrap-overrides.scss
rename to client/docs/scss/_bootstrap-overrides.scss
diff --git a/docs/scss/_contact.scss b/client/docs/scss/_contact.scss
similarity index 100%
rename from docs/scss/_contact.scss
rename to client/docs/scss/_contact.scss
diff --git a/docs/scss/_footer.scss b/client/docs/scss/_footer.scss
similarity index 100%
rename from docs/scss/_footer.scss
rename to client/docs/scss/_footer.scss
diff --git a/docs/scss/_global.scss b/client/docs/scss/_global.scss
similarity index 100%
rename from docs/scss/_global.scss
rename to client/docs/scss/_global.scss
diff --git a/docs/scss/_masthead.scss b/client/docs/scss/_masthead.scss
similarity index 100%
rename from docs/scss/_masthead.scss
rename to client/docs/scss/_masthead.scss
diff --git a/docs/scss/_mixins.scss b/client/docs/scss/_mixins.scss
similarity index 100%
rename from docs/scss/_mixins.scss
rename to client/docs/scss/_mixins.scss
diff --git a/docs/scss/_navbar.scss b/client/docs/scss/_navbar.scss
similarity index 100%
rename from docs/scss/_navbar.scss
rename to client/docs/scss/_navbar.scss
diff --git a/docs/scss/_portfolio.scss b/client/docs/scss/_portfolio.scss
similarity index 100%
rename from docs/scss/_portfolio.scss
rename to client/docs/scss/_portfolio.scss
diff --git a/docs/scss/_variables.scss b/client/docs/scss/_variables.scss
similarity index 100%
rename from docs/scss/_variables.scss
rename to client/docs/scss/_variables.scss
diff --git a/docs/scss/freelancer.scss b/client/docs/scss/freelancer.scss
similarity index 100%
rename from docs/scss/freelancer.scss
rename to client/docs/scss/freelancer.scss
diff --git a/docs/vendor/bootstrap/css/bootstrap-grid.css b/client/docs/vendor/bootstrap/css/bootstrap-grid.css
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap-grid.css
rename to client/docs/vendor/bootstrap/css/bootstrap-grid.css
diff --git a/docs/vendor/bootstrap/css/bootstrap-grid.min.css b/client/docs/vendor/bootstrap/css/bootstrap-grid.min.css
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap-grid.min.css
rename to client/docs/vendor/bootstrap/css/bootstrap-grid.min.css
diff --git a/docs/vendor/bootstrap/css/bootstrap-reboot.css b/client/docs/vendor/bootstrap/css/bootstrap-reboot.css
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap-reboot.css
rename to client/docs/vendor/bootstrap/css/bootstrap-reboot.css
diff --git a/docs/vendor/bootstrap/css/bootstrap-reboot.min.css b/client/docs/vendor/bootstrap/css/bootstrap-reboot.min.css
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap-reboot.min.css
rename to client/docs/vendor/bootstrap/css/bootstrap-reboot.min.css
diff --git a/docs/vendor/bootstrap/css/bootstrap.css b/client/docs/vendor/bootstrap/css/bootstrap.css
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap.css
rename to client/docs/vendor/bootstrap/css/bootstrap.css
diff --git a/docs/vendor/bootstrap/css/bootstrap.css.map b/client/docs/vendor/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap.css.map
rename to client/docs/vendor/bootstrap/css/bootstrap.css.map
diff --git a/docs/vendor/bootstrap/css/bootstrap.min.css b/client/docs/vendor/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap.min.css
rename to client/docs/vendor/bootstrap/css/bootstrap.min.css
diff --git a/docs/vendor/bootstrap/css/bootstrap.min.css.map b/client/docs/vendor/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from docs/vendor/bootstrap/css/bootstrap.min.css.map
rename to client/docs/vendor/bootstrap/css/bootstrap.min.css.map
diff --git a/docs/vendor/bootstrap/js/bootstrap.bundle.js b/client/docs/vendor/bootstrap/js/bootstrap.bundle.js
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.bundle.js
rename to client/docs/vendor/bootstrap/js/bootstrap.bundle.js
diff --git a/docs/vendor/bootstrap/js/bootstrap.bundle.js.map b/client/docs/vendor/bootstrap/js/bootstrap.bundle.js.map
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.bundle.js.map
rename to client/docs/vendor/bootstrap/js/bootstrap.bundle.js.map
diff --git a/docs/vendor/bootstrap/js/bootstrap.bundle.min.js b/client/docs/vendor/bootstrap/js/bootstrap.bundle.min.js
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.bundle.min.js
rename to client/docs/vendor/bootstrap/js/bootstrap.bundle.min.js
diff --git a/docs/vendor/bootstrap/js/bootstrap.bundle.min.js.map b/client/docs/vendor/bootstrap/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.bundle.min.js.map
rename to client/docs/vendor/bootstrap/js/bootstrap.bundle.min.js.map
diff --git a/docs/vendor/bootstrap/js/bootstrap.js b/client/docs/vendor/bootstrap/js/bootstrap.js
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.js
rename to client/docs/vendor/bootstrap/js/bootstrap.js
diff --git a/docs/vendor/bootstrap/js/bootstrap.js.map b/client/docs/vendor/bootstrap/js/bootstrap.js.map
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.js.map
rename to client/docs/vendor/bootstrap/js/bootstrap.js.map
diff --git a/docs/vendor/bootstrap/js/bootstrap.min.js b/client/docs/vendor/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.min.js
rename to client/docs/vendor/bootstrap/js/bootstrap.min.js
diff --git a/docs/vendor/bootstrap/js/bootstrap.min.js.map b/client/docs/vendor/bootstrap/js/bootstrap.min.js.map
similarity index 100%
rename from docs/vendor/bootstrap/js/bootstrap.min.js.map
rename to client/docs/vendor/bootstrap/js/bootstrap.min.js.map
diff --git a/docs/vendor/font-awesome/css/font-awesome.css b/client/docs/vendor/font-awesome/css/font-awesome.css
similarity index 100%
rename from docs/vendor/font-awesome/css/font-awesome.css
rename to client/docs/vendor/font-awesome/css/font-awesome.css
diff --git a/docs/vendor/font-awesome/css/font-awesome.css.map b/client/docs/vendor/font-awesome/css/font-awesome.css.map
similarity index 100%
rename from docs/vendor/font-awesome/css/font-awesome.css.map
rename to client/docs/vendor/font-awesome/css/font-awesome.css.map
diff --git a/docs/vendor/font-awesome/css/font-awesome.min.css b/client/docs/vendor/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from docs/vendor/font-awesome/css/font-awesome.min.css
rename to client/docs/vendor/font-awesome/css/font-awesome.min.css
diff --git a/docs/vendor/font-awesome/fonts/FontAwesome.otf b/client/docs/vendor/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from docs/vendor/font-awesome/fonts/FontAwesome.otf
rename to client/docs/vendor/font-awesome/fonts/FontAwesome.otf
diff --git a/docs/vendor/font-awesome/fonts/fontawesome-webfont.eot b/client/docs/vendor/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from docs/vendor/font-awesome/fonts/fontawesome-webfont.eot
rename to client/docs/vendor/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/docs/vendor/font-awesome/fonts/fontawesome-webfont.svg b/client/docs/vendor/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from docs/vendor/font-awesome/fonts/fontawesome-webfont.svg
rename to client/docs/vendor/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/docs/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/client/docs/vendor/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from docs/vendor/font-awesome/fonts/fontawesome-webfont.ttf
rename to client/docs/vendor/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/docs/vendor/font-awesome/fonts/fontawesome-webfont.woff b/client/docs/vendor/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from docs/vendor/font-awesome/fonts/fontawesome-webfont.woff
rename to client/docs/vendor/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/docs/vendor/font-awesome/fonts/fontawesome-webfont.woff2 b/client/docs/vendor/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from docs/vendor/font-awesome/fonts/fontawesome-webfont.woff2
rename to client/docs/vendor/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/docs/vendor/font-awesome/less/animated.less b/client/docs/vendor/font-awesome/less/animated.less
similarity index 100%
rename from docs/vendor/font-awesome/less/animated.less
rename to client/docs/vendor/font-awesome/less/animated.less
diff --git a/docs/vendor/font-awesome/less/bordered-pulled.less b/client/docs/vendor/font-awesome/less/bordered-pulled.less
similarity index 100%
rename from docs/vendor/font-awesome/less/bordered-pulled.less
rename to client/docs/vendor/font-awesome/less/bordered-pulled.less
diff --git a/docs/vendor/font-awesome/less/core.less b/client/docs/vendor/font-awesome/less/core.less
similarity index 100%
rename from docs/vendor/font-awesome/less/core.less
rename to client/docs/vendor/font-awesome/less/core.less
diff --git a/docs/vendor/font-awesome/less/fixed-width.less b/client/docs/vendor/font-awesome/less/fixed-width.less
similarity index 100%
rename from docs/vendor/font-awesome/less/fixed-width.less
rename to client/docs/vendor/font-awesome/less/fixed-width.less
diff --git a/docs/vendor/font-awesome/less/font-awesome.less b/client/docs/vendor/font-awesome/less/font-awesome.less
similarity index 100%
rename from docs/vendor/font-awesome/less/font-awesome.less
rename to client/docs/vendor/font-awesome/less/font-awesome.less
diff --git a/docs/vendor/font-awesome/less/icons.less b/client/docs/vendor/font-awesome/less/icons.less
similarity index 100%
rename from docs/vendor/font-awesome/less/icons.less
rename to client/docs/vendor/font-awesome/less/icons.less
diff --git a/docs/vendor/font-awesome/less/larger.less b/client/docs/vendor/font-awesome/less/larger.less
similarity index 100%
rename from docs/vendor/font-awesome/less/larger.less
rename to client/docs/vendor/font-awesome/less/larger.less
diff --git a/docs/vendor/font-awesome/less/list.less b/client/docs/vendor/font-awesome/less/list.less
similarity index 100%
rename from docs/vendor/font-awesome/less/list.less
rename to client/docs/vendor/font-awesome/less/list.less
diff --git a/docs/vendor/font-awesome/less/mixins.less b/client/docs/vendor/font-awesome/less/mixins.less
similarity index 100%
rename from docs/vendor/font-awesome/less/mixins.less
rename to client/docs/vendor/font-awesome/less/mixins.less
diff --git a/docs/vendor/font-awesome/less/path.less b/client/docs/vendor/font-awesome/less/path.less
similarity index 100%
rename from docs/vendor/font-awesome/less/path.less
rename to client/docs/vendor/font-awesome/less/path.less
diff --git a/docs/vendor/font-awesome/less/rotated-flipped.less b/client/docs/vendor/font-awesome/less/rotated-flipped.less
similarity index 100%
rename from docs/vendor/font-awesome/less/rotated-flipped.less
rename to client/docs/vendor/font-awesome/less/rotated-flipped.less
diff --git a/docs/vendor/font-awesome/less/screen-reader.less b/client/docs/vendor/font-awesome/less/screen-reader.less
similarity index 100%
rename from docs/vendor/font-awesome/less/screen-reader.less
rename to client/docs/vendor/font-awesome/less/screen-reader.less
diff --git a/docs/vendor/font-awesome/less/stacked.less b/client/docs/vendor/font-awesome/less/stacked.less
similarity index 100%
rename from docs/vendor/font-awesome/less/stacked.less
rename to client/docs/vendor/font-awesome/less/stacked.less
diff --git a/docs/vendor/font-awesome/less/variables.less b/client/docs/vendor/font-awesome/less/variables.less
similarity index 100%
rename from docs/vendor/font-awesome/less/variables.less
rename to client/docs/vendor/font-awesome/less/variables.less
diff --git a/docs/vendor/font-awesome/scss/_animated.scss b/client/docs/vendor/font-awesome/scss/_animated.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_animated.scss
rename to client/docs/vendor/font-awesome/scss/_animated.scss
diff --git a/docs/vendor/font-awesome/scss/_bordered-pulled.scss b/client/docs/vendor/font-awesome/scss/_bordered-pulled.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_bordered-pulled.scss
rename to client/docs/vendor/font-awesome/scss/_bordered-pulled.scss
diff --git a/docs/vendor/font-awesome/scss/_core.scss b/client/docs/vendor/font-awesome/scss/_core.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_core.scss
rename to client/docs/vendor/font-awesome/scss/_core.scss
diff --git a/docs/vendor/font-awesome/scss/_fixed-width.scss b/client/docs/vendor/font-awesome/scss/_fixed-width.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_fixed-width.scss
rename to client/docs/vendor/font-awesome/scss/_fixed-width.scss
diff --git a/docs/vendor/font-awesome/scss/_icons.scss b/client/docs/vendor/font-awesome/scss/_icons.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_icons.scss
rename to client/docs/vendor/font-awesome/scss/_icons.scss
diff --git a/docs/vendor/font-awesome/scss/_larger.scss b/client/docs/vendor/font-awesome/scss/_larger.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_larger.scss
rename to client/docs/vendor/font-awesome/scss/_larger.scss
diff --git a/docs/vendor/font-awesome/scss/_list.scss b/client/docs/vendor/font-awesome/scss/_list.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_list.scss
rename to client/docs/vendor/font-awesome/scss/_list.scss
diff --git a/docs/vendor/font-awesome/scss/_mixins.scss b/client/docs/vendor/font-awesome/scss/_mixins.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_mixins.scss
rename to client/docs/vendor/font-awesome/scss/_mixins.scss
diff --git a/docs/vendor/font-awesome/scss/_path.scss b/client/docs/vendor/font-awesome/scss/_path.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_path.scss
rename to client/docs/vendor/font-awesome/scss/_path.scss
diff --git a/docs/vendor/font-awesome/scss/_rotated-flipped.scss b/client/docs/vendor/font-awesome/scss/_rotated-flipped.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_rotated-flipped.scss
rename to client/docs/vendor/font-awesome/scss/_rotated-flipped.scss
diff --git a/docs/vendor/font-awesome/scss/_screen-reader.scss b/client/docs/vendor/font-awesome/scss/_screen-reader.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_screen-reader.scss
rename to client/docs/vendor/font-awesome/scss/_screen-reader.scss
diff --git a/docs/vendor/font-awesome/scss/_stacked.scss b/client/docs/vendor/font-awesome/scss/_stacked.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_stacked.scss
rename to client/docs/vendor/font-awesome/scss/_stacked.scss
diff --git a/docs/vendor/font-awesome/scss/_variables.scss b/client/docs/vendor/font-awesome/scss/_variables.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/_variables.scss
rename to client/docs/vendor/font-awesome/scss/_variables.scss
diff --git a/docs/vendor/font-awesome/scss/font-awesome.scss b/client/docs/vendor/font-awesome/scss/font-awesome.scss
similarity index 100%
rename from docs/vendor/font-awesome/scss/font-awesome.scss
rename to client/docs/vendor/font-awesome/scss/font-awesome.scss
diff --git a/docs/vendor/jquery-easing/jquery.easing.compatibility.js b/client/docs/vendor/jquery-easing/jquery.easing.compatibility.js
similarity index 100%
rename from docs/vendor/jquery-easing/jquery.easing.compatibility.js
rename to client/docs/vendor/jquery-easing/jquery.easing.compatibility.js
diff --git a/docs/vendor/jquery-easing/jquery.easing.js b/client/docs/vendor/jquery-easing/jquery.easing.js
similarity index 100%
rename from docs/vendor/jquery-easing/jquery.easing.js
rename to client/docs/vendor/jquery-easing/jquery.easing.js
diff --git a/docs/vendor/jquery-easing/jquery.easing.min.js b/client/docs/vendor/jquery-easing/jquery.easing.min.js
similarity index 100%
rename from docs/vendor/jquery-easing/jquery.easing.min.js
rename to client/docs/vendor/jquery-easing/jquery.easing.min.js
diff --git a/docs/vendor/jquery/jquery.js b/client/docs/vendor/jquery/jquery.js
similarity index 100%
rename from docs/vendor/jquery/jquery.js
rename to client/docs/vendor/jquery/jquery.js
diff --git a/docs/vendor/jquery/jquery.min.js b/client/docs/vendor/jquery/jquery.min.js
similarity index 100%
rename from docs/vendor/jquery/jquery.min.js
rename to client/docs/vendor/jquery/jquery.min.js
diff --git a/docs/vendor/jquery/jquery.min.map b/client/docs/vendor/jquery/jquery.min.map
similarity index 100%
rename from docs/vendor/jquery/jquery.min.map
rename to client/docs/vendor/jquery/jquery.min.map
diff --git a/docs/vendor/jquery/jquery.slim.js b/client/docs/vendor/jquery/jquery.slim.js
similarity index 100%
rename from docs/vendor/jquery/jquery.slim.js
rename to client/docs/vendor/jquery/jquery.slim.js
diff --git a/docs/vendor/jquery/jquery.slim.min.js b/client/docs/vendor/jquery/jquery.slim.min.js
similarity index 100%
rename from docs/vendor/jquery/jquery.slim.min.js
rename to client/docs/vendor/jquery/jquery.slim.min.js
diff --git a/docs/vendor/jquery/jquery.slim.min.map b/client/docs/vendor/jquery/jquery.slim.min.map
similarity index 100%
rename from docs/vendor/jquery/jquery.slim.min.map
rename to client/docs/vendor/jquery/jquery.slim.min.map
diff --git a/docs/vendor/magnific-popup/jquery.magnific-popup.js b/client/docs/vendor/magnific-popup/jquery.magnific-popup.js
similarity index 100%
rename from docs/vendor/magnific-popup/jquery.magnific-popup.js
rename to client/docs/vendor/magnific-popup/jquery.magnific-popup.js
diff --git a/docs/vendor/magnific-popup/jquery.magnific-popup.min.js b/client/docs/vendor/magnific-popup/jquery.magnific-popup.min.js
similarity index 100%
rename from docs/vendor/magnific-popup/jquery.magnific-popup.min.js
rename to client/docs/vendor/magnific-popup/jquery.magnific-popup.min.js
diff --git a/docs/vendor/magnific-popup/magnific-popup.css b/client/docs/vendor/magnific-popup/magnific-popup.css
similarity index 100%
rename from docs/vendor/magnific-popup/magnific-popup.css
rename to client/docs/vendor/magnific-popup/magnific-popup.css
diff --git a/pom.xml b/client/pom.xml
similarity index 99%
rename from pom.xml
rename to client/pom.xml
index 6a6b71a7..c5d1764e 100644
--- a/pom.xml
+++ b/client/pom.xml
@@ -4,7 +4,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ctbrec</groupId>
-	<artifactId>ctbrec</artifactId>
+	<artifactId>client</artifactId>
 	<version>1.9.0</version>
 
 	<properties>
diff --git a/src/assembly/ctbrec-linux-jre.sh b/client/src/assembly/ctbrec-linux-jre.sh
similarity index 100%
rename from src/assembly/ctbrec-linux-jre.sh
rename to client/src/assembly/ctbrec-linux-jre.sh
diff --git a/src/assembly/ctbrec-linux.sh b/client/src/assembly/ctbrec-linux.sh
similarity index 100%
rename from src/assembly/ctbrec-linux.sh
rename to client/src/assembly/ctbrec-linux.sh
diff --git a/src/assembly/ctbrec-macos-jre.sh b/client/src/assembly/ctbrec-macos-jre.sh
similarity index 100%
rename from src/assembly/ctbrec-macos-jre.sh
rename to client/src/assembly/ctbrec-macos-jre.sh
diff --git a/src/assembly/ctbrec-macos.sh b/client/src/assembly/ctbrec-macos.sh
similarity index 100%
rename from src/assembly/ctbrec-macos.sh
rename to client/src/assembly/ctbrec-macos.sh
diff --git a/src/assembly/linux-jre.xml b/client/src/assembly/linux-jre.xml
similarity index 100%
rename from src/assembly/linux-jre.xml
rename to client/src/assembly/linux-jre.xml
diff --git a/src/assembly/linux.xml b/client/src/assembly/linux.xml
similarity index 100%
rename from src/assembly/linux.xml
rename to client/src/assembly/linux.xml
diff --git a/src/assembly/macos-jre.xml b/client/src/assembly/macos-jre.xml
similarity index 100%
rename from src/assembly/macos-jre.xml
rename to client/src/assembly/macos-jre.xml
diff --git a/src/assembly/macos.xml b/client/src/assembly/macos.xml
similarity index 100%
rename from src/assembly/macos.xml
rename to client/src/assembly/macos.xml
diff --git a/src/assembly/server-jre.bat b/client/src/assembly/server-jre.bat
similarity index 100%
rename from src/assembly/server-jre.bat
rename to client/src/assembly/server-jre.bat
diff --git a/src/assembly/server-linux-jre.sh b/client/src/assembly/server-linux-jre.sh
similarity index 100%
rename from src/assembly/server-linux-jre.sh
rename to client/src/assembly/server-linux-jre.sh
diff --git a/src/assembly/server-linux.sh b/client/src/assembly/server-linux.sh
similarity index 100%
rename from src/assembly/server-linux.sh
rename to client/src/assembly/server-linux.sh
diff --git a/src/assembly/server-macos-jre.sh b/client/src/assembly/server-macos-jre.sh
similarity index 100%
rename from src/assembly/server-macos-jre.sh
rename to client/src/assembly/server-macos-jre.sh
diff --git a/src/assembly/server-macos.sh b/client/src/assembly/server-macos.sh
similarity index 100%
rename from src/assembly/server-macos.sh
rename to client/src/assembly/server-macos.sh
diff --git a/src/assembly/server.bat b/client/src/assembly/server.bat
similarity index 100%
rename from src/assembly/server.bat
rename to client/src/assembly/server.bat
diff --git a/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml
similarity index 100%
rename from src/assembly/win64-jre.xml
rename to client/src/assembly/win64-jre.xml
diff --git a/src/assembly/win64.xml b/client/src/assembly/win64.xml
similarity index 100%
rename from src/assembly/win64.xml
rename to client/src/assembly/win64.xml
diff --git a/src/main/java/ctbrec/AbstractModel.java b/client/src/main/java/ctbrec/AbstractModel.java
similarity index 100%
rename from src/main/java/ctbrec/AbstractModel.java
rename to client/src/main/java/ctbrec/AbstractModel.java
diff --git a/src/main/java/ctbrec/Config.java b/client/src/main/java/ctbrec/Config.java
similarity index 100%
rename from src/main/java/ctbrec/Config.java
rename to client/src/main/java/ctbrec/Config.java
diff --git a/src/main/java/ctbrec/Hmac.java b/client/src/main/java/ctbrec/Hmac.java
similarity index 100%
rename from src/main/java/ctbrec/Hmac.java
rename to client/src/main/java/ctbrec/Hmac.java
diff --git a/src/main/java/ctbrec/Java.java b/client/src/main/java/ctbrec/Java.java
similarity index 100%
rename from src/main/java/ctbrec/Java.java
rename to client/src/main/java/ctbrec/Java.java
diff --git a/src/main/java/ctbrec/LoggingInterceptor.java b/client/src/main/java/ctbrec/LoggingInterceptor.java
similarity index 100%
rename from src/main/java/ctbrec/LoggingInterceptor.java
rename to client/src/main/java/ctbrec/LoggingInterceptor.java
diff --git a/src/main/java/ctbrec/Model.java b/client/src/main/java/ctbrec/Model.java
similarity index 100%
rename from src/main/java/ctbrec/Model.java
rename to client/src/main/java/ctbrec/Model.java
diff --git a/src/main/java/ctbrec/OS.java b/client/src/main/java/ctbrec/OS.java
similarity index 100%
rename from src/main/java/ctbrec/OS.java
rename to client/src/main/java/ctbrec/OS.java
diff --git a/src/main/java/ctbrec/Recording.java b/client/src/main/java/ctbrec/Recording.java
similarity index 100%
rename from src/main/java/ctbrec/Recording.java
rename to client/src/main/java/ctbrec/Recording.java
diff --git a/src/main/java/ctbrec/Settings.java b/client/src/main/java/ctbrec/Settings.java
similarity index 100%
rename from src/main/java/ctbrec/Settings.java
rename to client/src/main/java/ctbrec/Settings.java
diff --git a/src/main/java/ctbrec/Version.java b/client/src/main/java/ctbrec/Version.java
similarity index 100%
rename from src/main/java/ctbrec/Version.java
rename to client/src/main/java/ctbrec/Version.java
diff --git a/src/main/java/ctbrec/io/CookieContainerJsonAdapter.java b/client/src/main/java/ctbrec/io/CookieContainerJsonAdapter.java
similarity index 100%
rename from src/main/java/ctbrec/io/CookieContainerJsonAdapter.java
rename to client/src/main/java/ctbrec/io/CookieContainerJsonAdapter.java
diff --git a/src/main/java/ctbrec/io/CookieJarImpl.java b/client/src/main/java/ctbrec/io/CookieJarImpl.java
similarity index 100%
rename from src/main/java/ctbrec/io/CookieJarImpl.java
rename to client/src/main/java/ctbrec/io/CookieJarImpl.java
diff --git a/src/main/java/ctbrec/io/CookieJsonAdapter.java b/client/src/main/java/ctbrec/io/CookieJsonAdapter.java
similarity index 100%
rename from src/main/java/ctbrec/io/CookieJsonAdapter.java
rename to client/src/main/java/ctbrec/io/CookieJsonAdapter.java
diff --git a/src/main/java/ctbrec/io/DevNull.java b/client/src/main/java/ctbrec/io/DevNull.java
similarity index 100%
rename from src/main/java/ctbrec/io/DevNull.java
rename to client/src/main/java/ctbrec/io/DevNull.java
diff --git a/src/main/java/ctbrec/io/HttpClient.java b/client/src/main/java/ctbrec/io/HttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/io/HttpClient.java
rename to client/src/main/java/ctbrec/io/HttpClient.java
diff --git a/src/main/java/ctbrec/io/HttpException.java b/client/src/main/java/ctbrec/io/HttpException.java
similarity index 100%
rename from src/main/java/ctbrec/io/HttpException.java
rename to client/src/main/java/ctbrec/io/HttpException.java
diff --git a/src/main/java/ctbrec/io/InstantJsonAdapter.java b/client/src/main/java/ctbrec/io/InstantJsonAdapter.java
similarity index 100%
rename from src/main/java/ctbrec/io/InstantJsonAdapter.java
rename to client/src/main/java/ctbrec/io/InstantJsonAdapter.java
diff --git a/src/main/java/ctbrec/io/ModelJsonAdapter.java b/client/src/main/java/ctbrec/io/ModelJsonAdapter.java
similarity index 100%
rename from src/main/java/ctbrec/io/ModelJsonAdapter.java
rename to client/src/main/java/ctbrec/io/ModelJsonAdapter.java
diff --git a/src/main/java/ctbrec/io/StreamRedirectThread.java b/client/src/main/java/ctbrec/io/StreamRedirectThread.java
similarity index 100%
rename from src/main/java/ctbrec/io/StreamRedirectThread.java
rename to client/src/main/java/ctbrec/io/StreamRedirectThread.java
diff --git a/src/main/java/ctbrec/recorder/LocalRecorder.java b/client/src/main/java/ctbrec/recorder/LocalRecorder.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/LocalRecorder.java
rename to client/src/main/java/ctbrec/recorder/LocalRecorder.java
diff --git a/src/main/java/ctbrec/recorder/PlaylistGenerator.java b/client/src/main/java/ctbrec/recorder/PlaylistGenerator.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/PlaylistGenerator.java
rename to client/src/main/java/ctbrec/recorder/PlaylistGenerator.java
diff --git a/src/main/java/ctbrec/recorder/ProgressListener.java b/client/src/main/java/ctbrec/recorder/ProgressListener.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/ProgressListener.java
rename to client/src/main/java/ctbrec/recorder/ProgressListener.java
diff --git a/src/main/java/ctbrec/recorder/Recorder.java b/client/src/main/java/ctbrec/recorder/Recorder.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/Recorder.java
rename to client/src/main/java/ctbrec/recorder/Recorder.java
diff --git a/src/main/java/ctbrec/recorder/RemoteRecorder.java b/client/src/main/java/ctbrec/recorder/RemoteRecorder.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/RemoteRecorder.java
rename to client/src/main/java/ctbrec/recorder/RemoteRecorder.java
diff --git a/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java b/client/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
rename to client/src/main/java/ctbrec/recorder/download/AbstractHlsDownload.java
diff --git a/src/main/java/ctbrec/recorder/download/Download.java b/client/src/main/java/ctbrec/recorder/download/Download.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/download/Download.java
rename to client/src/main/java/ctbrec/recorder/download/Download.java
diff --git a/src/main/java/ctbrec/recorder/download/HlsDownload.java b/client/src/main/java/ctbrec/recorder/download/HlsDownload.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/download/HlsDownload.java
rename to client/src/main/java/ctbrec/recorder/download/HlsDownload.java
diff --git a/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java b/client/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/download/MergedHlsDownload.java
rename to client/src/main/java/ctbrec/recorder/download/MergedHlsDownload.java
diff --git a/src/main/java/ctbrec/recorder/download/StreamSource.java b/client/src/main/java/ctbrec/recorder/download/StreamSource.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/download/StreamSource.java
rename to client/src/main/java/ctbrec/recorder/download/StreamSource.java
diff --git a/src/main/java/ctbrec/recorder/server/AbstractCtbrecServlet.java b/client/src/main/java/ctbrec/recorder/server/AbstractCtbrecServlet.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/server/AbstractCtbrecServlet.java
rename to client/src/main/java/ctbrec/recorder/server/AbstractCtbrecServlet.java
diff --git a/src/main/java/ctbrec/recorder/server/HlsServlet.java b/client/src/main/java/ctbrec/recorder/server/HlsServlet.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/server/HlsServlet.java
rename to client/src/main/java/ctbrec/recorder/server/HlsServlet.java
diff --git a/src/main/java/ctbrec/recorder/server/HttpServer.java b/client/src/main/java/ctbrec/recorder/server/HttpServer.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/server/HttpServer.java
rename to client/src/main/java/ctbrec/recorder/server/HttpServer.java
diff --git a/src/main/java/ctbrec/recorder/server/RecorderHttpClient.java b/client/src/main/java/ctbrec/recorder/server/RecorderHttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/server/RecorderHttpClient.java
rename to client/src/main/java/ctbrec/recorder/server/RecorderHttpClient.java
diff --git a/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/client/src/main/java/ctbrec/recorder/server/RecorderServlet.java
similarity index 100%
rename from src/main/java/ctbrec/recorder/server/RecorderServlet.java
rename to client/src/main/java/ctbrec/recorder/server/RecorderServlet.java
diff --git a/src/main/java/ctbrec/sites/AbstractSite.java b/client/src/main/java/ctbrec/sites/AbstractSite.java
similarity index 100%
rename from src/main/java/ctbrec/sites/AbstractSite.java
rename to client/src/main/java/ctbrec/sites/AbstractSite.java
diff --git a/src/main/java/ctbrec/sites/ConfigUI.java b/client/src/main/java/ctbrec/sites/ConfigUI.java
similarity index 100%
rename from src/main/java/ctbrec/sites/ConfigUI.java
rename to client/src/main/java/ctbrec/sites/ConfigUI.java
diff --git a/src/main/java/ctbrec/sites/Site.java b/client/src/main/java/ctbrec/sites/Site.java
similarity index 100%
rename from src/main/java/ctbrec/sites/Site.java
rename to client/src/main/java/ctbrec/sites/Site.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCams.java b/client/src/main/java/ctbrec/sites/bonga/BongaCams.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCams.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCams.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCamsConfigUI.java b/client/src/main/java/ctbrec/sites/bonga/BongaCamsConfigUI.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCamsConfigUI.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCamsConfigUI.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCamsHttpClient.java b/client/src/main/java/ctbrec/sites/bonga/BongaCamsHttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCamsHttpClient.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCamsHttpClient.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCamsLoginDialog.java b/client/src/main/java/ctbrec/sites/bonga/BongaCamsLoginDialog.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCamsLoginDialog.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCamsLoginDialog.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCamsModel.java b/client/src/main/java/ctbrec/sites/bonga/BongaCamsModel.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCamsModel.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCamsModel.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCamsTabProvider.java b/client/src/main/java/ctbrec/sites/bonga/BongaCamsTabProvider.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCamsTabProvider.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCamsTabProvider.java
diff --git a/src/main/java/ctbrec/sites/bonga/BongaCamsUpdateService.java b/client/src/main/java/ctbrec/sites/bonga/BongaCamsUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/bonga/BongaCamsUpdateService.java
rename to client/src/main/java/ctbrec/sites/bonga/BongaCamsUpdateService.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4.java b/client/src/main/java/ctbrec/sites/cam4/Cam4.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4ConfigUI.java b/client/src/main/java/ctbrec/sites/cam4/Cam4ConfigUI.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4ConfigUI.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4ConfigUI.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4FollowedTab.java b/client/src/main/java/ctbrec/sites/cam4/Cam4FollowedTab.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4FollowedTab.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4FollowedTab.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4FollowedUpdateService.java b/client/src/main/java/ctbrec/sites/cam4/Cam4FollowedUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4FollowedUpdateService.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4FollowedUpdateService.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4HttpClient.java b/client/src/main/java/ctbrec/sites/cam4/Cam4HttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4HttpClient.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4HttpClient.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4LoginDialog.java b/client/src/main/java/ctbrec/sites/cam4/Cam4LoginDialog.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4LoginDialog.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4LoginDialog.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4Model.java b/client/src/main/java/ctbrec/sites/cam4/Cam4Model.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4Model.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4Model.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4TabProvider.java b/client/src/main/java/ctbrec/sites/cam4/Cam4TabProvider.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4TabProvider.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4TabProvider.java
diff --git a/src/main/java/ctbrec/sites/cam4/Cam4UpdateService.java b/client/src/main/java/ctbrec/sites/cam4/Cam4UpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/cam4/Cam4UpdateService.java
rename to client/src/main/java/ctbrec/sites/cam4/Cam4UpdateService.java
diff --git a/src/main/java/ctbrec/sites/camsoda/Camsoda.java b/client/src/main/java/ctbrec/sites/camsoda/Camsoda.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/Camsoda.java
rename to client/src/main/java/ctbrec/sites/camsoda/Camsoda.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaConfigUI.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaConfigUI.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaConfigUI.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaConfigUI.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaFollowedTab.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaFollowedTab.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaFollowedTab.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaFollowedTab.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaFollowedUpdateService.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaFollowedUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaFollowedUpdateService.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaFollowedUpdateService.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaHttpClient.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaHttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaHttpClient.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaHttpClient.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaLoginDialog.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaLoginDialog.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaLoginDialog.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaLoginDialog.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaModel.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaModel.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaTabProvider.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaTabProvider.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaTabProvider.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaTabProvider.java
diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaUpdateService.java b/client/src/main/java/ctbrec/sites/camsoda/CamsodaUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/camsoda/CamsodaUpdateService.java
rename to client/src/main/java/ctbrec/sites/camsoda/CamsodaUpdateService.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java b/client/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/Chaturbate.java
rename to client/src/main/java/ctbrec/sites/chaturbate/Chaturbate.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateConfigUi.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateConfigUi.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateConfigUi.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateConfigUi.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateFollowedTab.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateFollowedTab.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateFollowedTab.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateFollowedTab.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateHttpClient.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateModelParser.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateModelParser.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateModelParser.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateModelParser.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateTabProvider.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateTabProvider.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateTabProvider.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateTabProvider.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/ChaturbateUpdateService.java b/client/src/main/java/ctbrec/sites/chaturbate/ChaturbateUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/ChaturbateUpdateService.java
rename to client/src/main/java/ctbrec/sites/chaturbate/ChaturbateUpdateService.java
diff --git a/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java b/client/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java
similarity index 100%
rename from src/main/java/ctbrec/sites/chaturbate/StreamInfo.java
rename to client/src/main/java/ctbrec/sites/chaturbate/StreamInfo.java
diff --git a/src/main/java/ctbrec/sites/mfc/Fcext.java b/client/src/main/java/ctbrec/sites/mfc/Fcext.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/Fcext.java
rename to client/src/main/java/ctbrec/sites/mfc/Fcext.java
diff --git a/src/main/java/ctbrec/sites/mfc/FriendsUpdateService.java b/client/src/main/java/ctbrec/sites/mfc/FriendsUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/FriendsUpdateService.java
rename to client/src/main/java/ctbrec/sites/mfc/FriendsUpdateService.java
diff --git a/src/main/java/ctbrec/sites/mfc/HDCamsUpdateService.java b/client/src/main/java/ctbrec/sites/mfc/HDCamsUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/HDCamsUpdateService.java
rename to client/src/main/java/ctbrec/sites/mfc/HDCamsUpdateService.java
diff --git a/src/main/java/ctbrec/sites/mfc/Message.java b/client/src/main/java/ctbrec/sites/mfc/Message.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/Message.java
rename to client/src/main/java/ctbrec/sites/mfc/Message.java
diff --git a/src/main/java/ctbrec/sites/mfc/MessageTypes.java b/client/src/main/java/ctbrec/sites/mfc/MessageTypes.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MessageTypes.java
rename to client/src/main/java/ctbrec/sites/mfc/MessageTypes.java
diff --git a/src/main/java/ctbrec/sites/mfc/Model.java b/client/src/main/java/ctbrec/sites/mfc/Model.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/Model.java
rename to client/src/main/java/ctbrec/sites/mfc/Model.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCams.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCams.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCams.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCams.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsConfigUI.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCamsConfigUI.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCamsConfigUI.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCamsConfigUI.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsFriendsTab.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCamsFriendsTab.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCamsFriendsTab.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCamsFriendsTab.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCamsHttpClient.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCamsModel.java
diff --git a/src/main/java/ctbrec/sites/mfc/MyFreeCamsTabProvider.java b/client/src/main/java/ctbrec/sites/mfc/MyFreeCamsTabProvider.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/MyFreeCamsTabProvider.java
rename to client/src/main/java/ctbrec/sites/mfc/MyFreeCamsTabProvider.java
diff --git a/src/main/java/ctbrec/sites/mfc/OnlineCamsUpdateService.java b/client/src/main/java/ctbrec/sites/mfc/OnlineCamsUpdateService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/OnlineCamsUpdateService.java
rename to client/src/main/java/ctbrec/sites/mfc/OnlineCamsUpdateService.java
diff --git a/src/main/java/ctbrec/sites/mfc/PopularModelService.java b/client/src/main/java/ctbrec/sites/mfc/PopularModelService.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/PopularModelService.java
rename to client/src/main/java/ctbrec/sites/mfc/PopularModelService.java
diff --git a/src/main/java/ctbrec/sites/mfc/ServerConfig.java b/client/src/main/java/ctbrec/sites/mfc/ServerConfig.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/ServerConfig.java
rename to client/src/main/java/ctbrec/sites/mfc/ServerConfig.java
diff --git a/src/main/java/ctbrec/sites/mfc/SessionState.java b/client/src/main/java/ctbrec/sites/mfc/SessionState.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/SessionState.java
rename to client/src/main/java/ctbrec/sites/mfc/SessionState.java
diff --git a/src/main/java/ctbrec/sites/mfc/Share.java b/client/src/main/java/ctbrec/sites/mfc/Share.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/Share.java
rename to client/src/main/java/ctbrec/sites/mfc/Share.java
diff --git a/src/main/java/ctbrec/sites/mfc/State.java b/client/src/main/java/ctbrec/sites/mfc/State.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/State.java
rename to client/src/main/java/ctbrec/sites/mfc/State.java
diff --git a/src/main/java/ctbrec/sites/mfc/User.java b/client/src/main/java/ctbrec/sites/mfc/User.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/User.java
rename to client/src/main/java/ctbrec/sites/mfc/User.java
diff --git a/src/main/java/ctbrec/sites/mfc/X.java b/client/src/main/java/ctbrec/sites/mfc/X.java
similarity index 100%
rename from src/main/java/ctbrec/sites/mfc/X.java
rename to client/src/main/java/ctbrec/sites/mfc/X.java
diff --git a/src/main/java/ctbrec/ui/AutosizeAlert.java b/client/src/main/java/ctbrec/ui/AutosizeAlert.java
similarity index 100%
rename from src/main/java/ctbrec/ui/AutosizeAlert.java
rename to client/src/main/java/ctbrec/ui/AutosizeAlert.java
diff --git a/src/main/java/ctbrec/ui/CamrecApplication.java b/client/src/main/java/ctbrec/ui/CamrecApplication.java
similarity index 100%
rename from src/main/java/ctbrec/ui/CamrecApplication.java
rename to client/src/main/java/ctbrec/ui/CamrecApplication.java
diff --git a/src/main/java/ctbrec/ui/DesktopIntegration.java b/client/src/main/java/ctbrec/ui/DesktopIntegration.java
similarity index 100%
rename from src/main/java/ctbrec/ui/DesktopIntegration.java
rename to client/src/main/java/ctbrec/ui/DesktopIntegration.java
diff --git a/src/main/java/ctbrec/ui/DonateTabFx.java b/client/src/main/java/ctbrec/ui/DonateTabFx.java
similarity index 100%
rename from src/main/java/ctbrec/ui/DonateTabFx.java
rename to client/src/main/java/ctbrec/ui/DonateTabFx.java
diff --git a/src/main/java/ctbrec/ui/DonateTabHtml.java b/client/src/main/java/ctbrec/ui/DonateTabHtml.java
similarity index 100%
rename from src/main/java/ctbrec/ui/DonateTabHtml.java
rename to client/src/main/java/ctbrec/ui/DonateTabHtml.java
diff --git a/src/main/java/ctbrec/ui/FollowedTab.java b/client/src/main/java/ctbrec/ui/FollowedTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/FollowedTab.java
rename to client/src/main/java/ctbrec/ui/FollowedTab.java
diff --git a/src/main/java/ctbrec/ui/HtmlParser.java b/client/src/main/java/ctbrec/ui/HtmlParser.java
similarity index 100%
rename from src/main/java/ctbrec/ui/HtmlParser.java
rename to client/src/main/java/ctbrec/ui/HtmlParser.java
diff --git a/src/main/java/ctbrec/ui/JavaFxModel.java b/client/src/main/java/ctbrec/ui/JavaFxModel.java
similarity index 100%
rename from src/main/java/ctbrec/ui/JavaFxModel.java
rename to client/src/main/java/ctbrec/ui/JavaFxModel.java
diff --git a/src/main/java/ctbrec/ui/JavaFxRecording.java b/client/src/main/java/ctbrec/ui/JavaFxRecording.java
similarity index 100%
rename from src/main/java/ctbrec/ui/JavaFxRecording.java
rename to client/src/main/java/ctbrec/ui/JavaFxRecording.java
diff --git a/src/main/java/ctbrec/ui/Launcher.java b/client/src/main/java/ctbrec/ui/Launcher.java
similarity index 100%
rename from src/main/java/ctbrec/ui/Launcher.java
rename to client/src/main/java/ctbrec/ui/Launcher.java
diff --git a/src/main/java/ctbrec/ui/PaginatedScheduledService.java b/client/src/main/java/ctbrec/ui/PaginatedScheduledService.java
similarity index 100%
rename from src/main/java/ctbrec/ui/PaginatedScheduledService.java
rename to client/src/main/java/ctbrec/ui/PaginatedScheduledService.java
diff --git a/src/main/java/ctbrec/ui/PauseIndicator.java b/client/src/main/java/ctbrec/ui/PauseIndicator.java
similarity index 100%
rename from src/main/java/ctbrec/ui/PauseIndicator.java
rename to client/src/main/java/ctbrec/ui/PauseIndicator.java
diff --git a/src/main/java/ctbrec/ui/Player.java b/client/src/main/java/ctbrec/ui/Player.java
similarity index 100%
rename from src/main/java/ctbrec/ui/Player.java
rename to client/src/main/java/ctbrec/ui/Player.java
diff --git a/src/main/java/ctbrec/ui/ProxySettingsPane.java b/client/src/main/java/ctbrec/ui/ProxySettingsPane.java
similarity index 100%
rename from src/main/java/ctbrec/ui/ProxySettingsPane.java
rename to client/src/main/java/ctbrec/ui/ProxySettingsPane.java
diff --git a/src/main/java/ctbrec/ui/RecordedModelsTab.java b/client/src/main/java/ctbrec/ui/RecordedModelsTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/RecordedModelsTab.java
rename to client/src/main/java/ctbrec/ui/RecordedModelsTab.java
diff --git a/src/main/java/ctbrec/ui/RecordingsTab.java b/client/src/main/java/ctbrec/ui/RecordingsTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/RecordingsTab.java
rename to client/src/main/java/ctbrec/ui/RecordingsTab.java
diff --git a/src/main/java/ctbrec/ui/SettingsTab.java b/client/src/main/java/ctbrec/ui/SettingsTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/SettingsTab.java
rename to client/src/main/java/ctbrec/ui/SettingsTab.java
diff --git a/src/main/java/ctbrec/ui/SiteTab.java b/client/src/main/java/ctbrec/ui/SiteTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/SiteTab.java
rename to client/src/main/java/ctbrec/ui/SiteTab.java
diff --git a/src/main/java/ctbrec/ui/SiteTabPane.java b/client/src/main/java/ctbrec/ui/SiteTabPane.java
similarity index 100%
rename from src/main/java/ctbrec/ui/SiteTabPane.java
rename to client/src/main/java/ctbrec/ui/SiteTabPane.java
diff --git a/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java b/client/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java
similarity index 100%
rename from src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java
rename to client/src/main/java/ctbrec/ui/StreamSourceSelectionDialog.java
diff --git a/src/main/java/ctbrec/ui/TabProvider.java b/client/src/main/java/ctbrec/ui/TabProvider.java
similarity index 100%
rename from src/main/java/ctbrec/ui/TabProvider.java
rename to client/src/main/java/ctbrec/ui/TabProvider.java
diff --git a/src/main/java/ctbrec/ui/TabSelectionListener.java b/client/src/main/java/ctbrec/ui/TabSelectionListener.java
similarity index 100%
rename from src/main/java/ctbrec/ui/TabSelectionListener.java
rename to client/src/main/java/ctbrec/ui/TabSelectionListener.java
diff --git a/src/main/java/ctbrec/ui/ThumbCell.css b/client/src/main/java/ctbrec/ui/ThumbCell.css
similarity index 100%
rename from src/main/java/ctbrec/ui/ThumbCell.css
rename to client/src/main/java/ctbrec/ui/ThumbCell.css
diff --git a/src/main/java/ctbrec/ui/ThumbCell.java b/client/src/main/java/ctbrec/ui/ThumbCell.java
similarity index 100%
rename from src/main/java/ctbrec/ui/ThumbCell.java
rename to client/src/main/java/ctbrec/ui/ThumbCell.java
diff --git a/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/ThumbOverviewTab.java
rename to client/src/main/java/ctbrec/ui/ThumbOverviewTab.java
diff --git a/src/main/java/ctbrec/ui/TipDialog.java b/client/src/main/java/ctbrec/ui/TipDialog.java
similarity index 100%
rename from src/main/java/ctbrec/ui/TipDialog.java
rename to client/src/main/java/ctbrec/ui/TipDialog.java
diff --git a/src/main/java/ctbrec/ui/TokenLabel.java b/client/src/main/java/ctbrec/ui/TokenLabel.java
similarity index 100%
rename from src/main/java/ctbrec/ui/TokenLabel.java
rename to client/src/main/java/ctbrec/ui/TokenLabel.java
diff --git a/src/main/java/ctbrec/ui/UpdateTab.java b/client/src/main/java/ctbrec/ui/UpdateTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/UpdateTab.java
rename to client/src/main/java/ctbrec/ui/UpdateTab.java
diff --git a/src/main/java/ctbrec/ui/WebbrowserTab.java b/client/src/main/java/ctbrec/ui/WebbrowserTab.java
similarity index 100%
rename from src/main/java/ctbrec/ui/WebbrowserTab.java
rename to client/src/main/java/ctbrec/ui/WebbrowserTab.java
diff --git a/src/main/java/ctbrec/ui/autofilltextbox/AutoFillTextField.java b/client/src/main/java/ctbrec/ui/autofilltextbox/AutoFillTextField.java
similarity index 100%
rename from src/main/java/ctbrec/ui/autofilltextbox/AutoFillTextField.java
rename to client/src/main/java/ctbrec/ui/autofilltextbox/AutoFillTextField.java
diff --git a/src/main/java/org/taktik/CHANGELOG.md b/client/src/main/java/org/taktik/CHANGELOG.md
similarity index 100%
rename from src/main/java/org/taktik/CHANGELOG.md
rename to client/src/main/java/org/taktik/CHANGELOG.md
diff --git a/src/main/java/org/taktik/ioutils/NIOUtils.java b/client/src/main/java/org/taktik/ioutils/NIOUtils.java
similarity index 100%
rename from src/main/java/org/taktik/ioutils/NIOUtils.java
rename to client/src/main/java/org/taktik/ioutils/NIOUtils.java
diff --git a/src/main/java/org/taktik/mpegts/Constants.java b/client/src/main/java/org/taktik/mpegts/Constants.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/Constants.java
rename to client/src/main/java/org/taktik/mpegts/Constants.java
diff --git a/src/main/java/org/taktik/mpegts/MTSPacket.java b/client/src/main/java/org/taktik/mpegts/MTSPacket.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/MTSPacket.java
rename to client/src/main/java/org/taktik/mpegts/MTSPacket.java
diff --git a/src/main/java/org/taktik/mpegts/Merger.java b/client/src/main/java/org/taktik/mpegts/Merger.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/Merger.java
rename to client/src/main/java/org/taktik/mpegts/Merger.java
diff --git a/src/main/java/org/taktik/mpegts/PATSection.java b/client/src/main/java/org/taktik/mpegts/PATSection.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/PATSection.java
rename to client/src/main/java/org/taktik/mpegts/PATSection.java
diff --git a/src/main/java/org/taktik/mpegts/PMTSection.java b/client/src/main/java/org/taktik/mpegts/PMTSection.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/PMTSection.java
rename to client/src/main/java/org/taktik/mpegts/PMTSection.java
diff --git a/src/main/java/org/taktik/mpegts/PSISection.java b/client/src/main/java/org/taktik/mpegts/PSISection.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/PSISection.java
rename to client/src/main/java/org/taktik/mpegts/PSISection.java
diff --git a/src/main/java/org/taktik/mpegts/PacketSupport.java b/client/src/main/java/org/taktik/mpegts/PacketSupport.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/PacketSupport.java
rename to client/src/main/java/org/taktik/mpegts/PacketSupport.java
diff --git a/src/main/java/org/taktik/mpegts/Streamer.java b/client/src/main/java/org/taktik/mpegts/Streamer.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/Streamer.java
rename to client/src/main/java/org/taktik/mpegts/Streamer.java
diff --git a/src/main/java/org/taktik/mpegts/StreamerTest.java b/client/src/main/java/org/taktik/mpegts/StreamerTest.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/StreamerTest.java
rename to client/src/main/java/org/taktik/mpegts/StreamerTest.java
diff --git a/src/main/java/org/taktik/mpegts/sinks/ByteChannelSink.java b/client/src/main/java/org/taktik/mpegts/sinks/ByteChannelSink.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sinks/ByteChannelSink.java
rename to client/src/main/java/org/taktik/mpegts/sinks/ByteChannelSink.java
diff --git a/src/main/java/org/taktik/mpegts/sinks/MTSSink.java b/client/src/main/java/org/taktik/mpegts/sinks/MTSSink.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sinks/MTSSink.java
rename to client/src/main/java/org/taktik/mpegts/sinks/MTSSink.java
diff --git a/src/main/java/org/taktik/mpegts/sinks/UDPTransport.java b/client/src/main/java/org/taktik/mpegts/sinks/UDPTransport.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sinks/UDPTransport.java
rename to client/src/main/java/org/taktik/mpegts/sinks/UDPTransport.java
diff --git a/src/main/java/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/AbstractByteChannelMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/AbstractMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/AbstractMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/AbstractMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/AbstractMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/BlockingMultiMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/BlockingMultiMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/BlockingMultiMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/BlockingMultiMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/ByteChannelMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/ByteChannelMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/ByteChannelMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/ByteChannelMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/ByteSourceMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/ByteSourceMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/ByteSourceMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/ByteSourceMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/ConcatenatingMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/ConcatenatingMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/ConcatenatingMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/ConcatenatingMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java b/client/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java
rename to client/src/main/java/org/taktik/mpegts/sources/ContinuityFixer.java
diff --git a/src/main/java/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/ContinuityFixingMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/FixedBitrateMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/FixedBitrateMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/FixedBitrateMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/FixedBitrateMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/InputStreamMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/InputStreamMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/InputStreamMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/InputStreamMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/LoopingMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/LoopingMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/LoopingMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/LoopingMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/MTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/MTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/MTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/MTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/MTSSources.java b/client/src/main/java/org/taktik/mpegts/sources/MTSSources.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/MTSSources.java
rename to client/src/main/java/org/taktik/mpegts/sources/MTSSources.java
diff --git a/src/main/java/org/taktik/mpegts/sources/MultiplexingMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/MultiplexingMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/MultiplexingMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/MultiplexingMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/NullPacketSource.java b/client/src/main/java/org/taktik/mpegts/sources/NullPacketSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/NullPacketSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/NullPacketSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/ResettableMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/ResettableMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/ResettableMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/ResettableMTSSource.java
diff --git a/src/main/java/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java b/client/src/main/java/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java
similarity index 100%
rename from src/main/java/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java
rename to client/src/main/java/org/taktik/mpegts/sources/SeekableByteChannelMTSSource.java
diff --git a/src/main/resources/ctb-logo.png b/client/src/main/resources/ctb-logo.png
similarity index 100%
rename from src/main/resources/ctb-logo.png
rename to client/src/main/resources/ctb-logo.png
diff --git a/src/main/resources/html/bitcoin-address.png b/client/src/main/resources/html/bitcoin-address.png
similarity index 100%
rename from src/main/resources/html/bitcoin-address.png
rename to client/src/main/resources/html/bitcoin-address.png
diff --git a/src/main/resources/html/bitcoin.png b/client/src/main/resources/html/bitcoin.png
similarity index 100%
rename from src/main/resources/html/bitcoin.png
rename to client/src/main/resources/html/bitcoin.png
diff --git a/src/main/resources/html/buymeacoffee-fancy.png b/client/src/main/resources/html/buymeacoffee-fancy.png
similarity index 100%
rename from src/main/resources/html/buymeacoffee-fancy.png
rename to client/src/main/resources/html/buymeacoffee-fancy.png
diff --git a/src/main/resources/html/ethereum-address.png b/client/src/main/resources/html/ethereum-address.png
similarity index 100%
rename from src/main/resources/html/ethereum-address.png
rename to client/src/main/resources/html/ethereum-address.png
diff --git a/src/main/resources/html/ethereum.png b/client/src/main/resources/html/ethereum.png
similarity index 100%
rename from src/main/resources/html/ethereum.png
rename to client/src/main/resources/html/ethereum.png
diff --git a/src/main/resources/html/monero-address.png b/client/src/main/resources/html/monero-address.png
similarity index 100%
rename from src/main/resources/html/monero-address.png
rename to client/src/main/resources/html/monero-address.png
diff --git a/src/main/resources/html/monero.png b/client/src/main/resources/html/monero.png
similarity index 100%
rename from src/main/resources/html/monero.png
rename to client/src/main/resources/html/monero.png
diff --git a/src/main/resources/html/token.png b/client/src/main/resources/html/token.png
similarity index 100%
rename from src/main/resources/html/token.png
rename to client/src/main/resources/html/token.png
diff --git a/src/main/resources/html/token.xcf b/client/src/main/resources/html/token.xcf
similarity index 100%
rename from src/main/resources/html/token.xcf
rename to client/src/main/resources/html/token.xcf
diff --git a/src/main/resources/icon.ico b/client/src/main/resources/icon.ico
similarity index 100%
rename from src/main/resources/icon.ico
rename to client/src/main/resources/icon.ico
diff --git a/src/main/resources/icon.png b/client/src/main/resources/icon.png
similarity index 100%
rename from src/main/resources/icon.png
rename to client/src/main/resources/icon.png
diff --git a/src/main/resources/icon.svg b/client/src/main/resources/icon.svg
similarity index 100%
rename from src/main/resources/icon.svg
rename to client/src/main/resources/icon.svg
diff --git a/src/main/resources/icon128.png b/client/src/main/resources/icon128.png
similarity index 100%
rename from src/main/resources/icon128.png
rename to client/src/main/resources/icon128.png
diff --git a/src/main/resources/icon16.png b/client/src/main/resources/icon16.png
similarity index 100%
rename from src/main/resources/icon16.png
rename to client/src/main/resources/icon16.png
diff --git a/src/main/resources/icon32.png b/client/src/main/resources/icon32.png
similarity index 100%
rename from src/main/resources/icon32.png
rename to client/src/main/resources/icon32.png
diff --git a/src/main/resources/icon64.png b/client/src/main/resources/icon64.png
similarity index 100%
rename from src/main/resources/icon64.png
rename to client/src/main/resources/icon64.png
diff --git a/src/main/resources/image_not_found.png b/client/src/main/resources/image_not_found.png
similarity index 100%
rename from src/main/resources/image_not_found.png
rename to client/src/main/resources/image_not_found.png
diff --git a/src/main/resources/logback.xml b/client/src/main/resources/logback.xml
similarity index 100%
rename from src/main/resources/logback.xml
rename to client/src/main/resources/logback.xml
diff --git a/src/main/resources/pp.bat b/client/src/main/resources/pp.bat
similarity index 100%
rename from src/main/resources/pp.bat
rename to client/src/main/resources/pp.bat
diff --git a/src/main/resources/pp.ps1 b/client/src/main/resources/pp.ps1
similarity index 100%
rename from src/main/resources/pp.ps1
rename to client/src/main/resources/pp.ps1
diff --git a/src/main/resources/pp.sh b/client/src/main/resources/pp.sh
similarity index 100%
rename from src/main/resources/pp.sh
rename to client/src/main/resources/pp.sh
diff --git a/src/main/resources/splash.bmp b/client/src/main/resources/splash.bmp
similarity index 100%
rename from src/main/resources/splash.bmp
rename to client/src/main/resources/splash.bmp
diff --git a/src/main/resources/splash.png b/client/src/main/resources/splash.png
similarity index 100%
rename from src/main/resources/splash.png
rename to client/src/main/resources/splash.png
diff --git a/src/main/resources/splash.svg b/client/src/main/resources/splash.svg
similarity index 100%
rename from src/main/resources/splash.svg
rename to client/src/main/resources/splash.svg
diff --git a/src/main/resources/version b/client/src/main/resources/version
similarity index 100%
rename from src/main/resources/version
rename to client/src/main/resources/version
diff --git a/src/test/java/ctbrec/VersionTest.java b/client/src/test/java/ctbrec/VersionTest.java
similarity index 100%
rename from src/test/java/ctbrec/VersionTest.java
rename to client/src/test/java/ctbrec/VersionTest.java
diff --git a/src/test/resources/req-list.json b/client/src/test/resources/req-list.json
similarity index 100%
rename from src/test/resources/req-list.json
rename to client/src/test/resources/req-list.json
diff --git a/src/test/resources/req-start-pink.json b/client/src/test/resources/req-start-pink.json
similarity index 100%
rename from src/test/resources/req-start-pink.json
rename to client/src/test/resources/req-start-pink.json
diff --git a/src/test/resources/req-start-queen.json b/client/src/test/resources/req-start-queen.json
similarity index 100%
rename from src/test/resources/req-start-queen.json
rename to client/src/test/resources/req-start-queen.json
diff --git a/src/test/resources/req-start-uv.json b/client/src/test/resources/req-start-uv.json
similarity index 100%
rename from src/test/resources/req-start-uv.json
rename to client/src/test/resources/req-start-uv.json
diff --git a/src/test/resources/req-stop-pink.json b/client/src/test/resources/req-stop-pink.json
similarity index 100%
rename from src/test/resources/req-stop-pink.json
rename to client/src/test/resources/req-stop-pink.json
diff --git a/src/test/resources/req-stop-queen.json b/client/src/test/resources/req-stop-queen.json
similarity index 100%
rename from src/test/resources/req-stop-queen.json
rename to client/src/test/resources/req-stop-queen.json
diff --git a/src/test/resources/req-stop-uv.json b/client/src/test/resources/req-stop-uv.json
similarity index 100%
rename from src/test/resources/req-stop-uv.json
rename to client/src/test/resources/req-stop-uv.json
diff --git a/master/.project b/master/.project
new file mode 100644
index 00000000..475663aa
--- /dev/null
+++ b/master/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cbtrec-master</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/master/.settings/org.eclipse.core.resources.prefs b/master/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..99f26c02
--- /dev/null
+++ b/master/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/master/.settings/org.eclipse.m2e.core.prefs b/master/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..f897a7f1
--- /dev/null
+++ b/master/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/master/pom.xml b/master/pom.xml
new file mode 100644
index 00000000..6778e809
--- /dev/null
+++ b/master/pom.xml
@@ -0,0 +1,134 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>ctbrec</groupId>
+	<artifactId>master</artifactId>
+    <packaging>pom</packaging>
+	<version>1.9.0</version>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+    
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.css</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>version</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>${name.final}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptorRefs>
+								<descriptorRef>jar-with-dependencies</descriptorRef>
+							</descriptorRefs>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.10.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.10.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.moshi</groupId>
+			<artifactId>moshi</artifactId>
+			<version>1.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20180130</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>[9.3.24.v20180605,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>[9.3.24.v20180605,)</version>
+		</dependency>
+		<dependency>
+			<groupId>com.iheartradio.m3u8</groupId>
+			<artifactId>open-m3u8</artifactId>
+			<version>0.2.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jcodec</groupId>
+			<artifactId>jcodec</artifactId>
+			<version>0.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-web</artifactId>
+			<version>11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>17.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/server/.classpath b/server/.classpath
new file mode 100644
index 00000000..d6554125
--- /dev/null
+++ b/server/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/server/.project b/server/.project
new file mode 100644
index 00000000..d837ad8a
--- /dev/null
+++ b/server/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ctbrec-server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/server/.settings/org.eclipse.jdt.core.prefs b/server/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..a54bb93c
--- /dev/null
+++ b/server/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=10
diff --git a/server/pom.xml b/server/pom.xml
new file mode 100644
index 00000000..9aed519b
--- /dev/null
+++ b/server/pom.xml
@@ -0,0 +1,285 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>ctbrec</groupId>
+	<artifactId>server</artifactId>
+	<version>1.9.0</version>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
+		<name.final>${project.artifactId}-${project.version}-final</name.final>
+	</properties>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.css</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>version</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>${name.final}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptorRefs>
+								<descriptorRef>jar-with-dependencies</descriptorRef>
+							</descriptorRefs>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.10.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.10.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.moshi</groupId>
+			<artifactId>moshi</artifactId>
+			<version>1.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20180130</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>[9.3.24.v20180605,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>[9.3.24.v20180605,)</version>
+		</dependency>
+		<dependency>
+			<groupId>com.iheartradio.m3u8</groupId>
+			<artifactId>open-m3u8</artifactId>
+			<version>0.2.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jcodec</groupId>
+			<artifactId>jcodec</artifactId>
+			<version>0.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-web</artifactId>
+			<version>11</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>17.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>win</id>
+			<activation>
+				<property>
+					<name>javafx.platform</name>
+					<value>win</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>com.akathist.maven.plugins.launch4j</groupId>
+						<artifactId>launch4j-maven-plugin</artifactId>
+						<version>1.7.22</version>
+						<executions>
+							<execution>
+								<id>l4j-win</id>
+								<phase>package</phase>
+								<goals>
+									<goal>launch4j</goal>
+								</goals>
+								<configuration>
+									<headerType>gui</headerType>
+									<outfile>target/ctbrec.exe</outfile>
+									<jar>${name.final}.jar</jar>
+									<dontWrapJar>true</dontWrapJar>
+									<icon>src/main/resources/icon.ico</icon>
+									<errTitle>ctbrec</errTitle>
+									<classPath>
+										<mainClass>ctbrec.ui.Launcher</mainClass>
+										<addDependencies>false</addDependencies>
+										<preCp>anything</preCp>
+									</classPath>
+									<jre>
+										<path>jre</path>
+										<bundledJre64Bit>true</bundledJre64Bit>
+										<minVersion>1.8.0</minVersion>
+										<maxHeapSize>512</maxHeapSize>
+									</jre>
+									<versionInfo>
+										<fileVersion>${project.version}.0</fileVersion>
+										<txtFileVersion>${project.version}</txtFileVersion>
+										<fileDescription>Recorder for Charturbate streams</fileDescription>
+										<copyright>2018 0xboobface</copyright>
+										<productVersion>${project.version}.0</productVersion>
+										<txtProductVersion>${project.version}</txtProductVersion>
+										<productName>CTB Recorder</productName>
+										<internalName>ctbrec</internalName>
+										<originalFilename>ctbrec.exe</originalFilename>
+									</versionInfo>
+									<splash>
+										<file>src/main/resources/splash.bmp</file>
+										<waitForWindow>true</waitForWindow>
+										<timeout>60</timeout>
+										<timeoutErr>true</timeoutErr>
+									</splash>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>3.1.0</version>
+						<executions>
+							<execution>
+								<id>zip</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>src/assembly/win64.xml</descriptor>
+										<descriptor>src/assembly/win64-jre.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>linux</id>
+			<activation>
+				<property>
+					<name>javafx.platform</name>
+					<value>linux</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>3.1.0</version>
+						<executions>
+							<execution>
+								<id>zip</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>src/assembly/linux.xml</descriptor>
+										<descriptor>src/assembly/linux-jre.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>macos</id>
+			<activation>
+				<property>
+					<name>javafx.platform</name>
+					<value>mac</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>3.1.0</version>
+						<executions>
+							<execution>
+								<id>zip</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>src/assembly/macos.xml</descriptor>
+										<descriptor>src/assembly/macos-jre.xml</descriptor>
+									</descriptors>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>