diff --git a/Mamoth/.editorconfig b/.editorconfig
similarity index 100%
rename from Mamoth/.editorconfig
rename to .editorconfig
diff --git a/.gitignore b/.gitignore
index 3e179597..eabf65e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,62 +1,44 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+# See http://help.github.com/ignore-files/ for more about ignoring files.
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
+# compiled output
+/dist
+/dist-server
+/tmp
+/out-tsc
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
+# dependencies
+/node_modules
-# Coverage directory used by tools like istanbul
-coverage
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
-# nyc test coverage
-.nyc_output
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
-# Bower dependency directory (https://bower.io/)
-bower_components
+# e2e
+/e2e/*.js
+/e2e/*.map
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Typescript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-/.vs
-/Mamoth/bin
-/Mamoth/obj
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/.vs/Mamoth/v15/.suo b/.vs/Mamoth/v15/.suo
new file mode 100644
index 00000000..c56ce927
Binary files /dev/null and b/.vs/Mamoth/v15/.suo differ
diff --git a/Mamoth/src/app/pages/register-new-account/register-new-account.component.css b/.vs/Mamoth/v15/Server/sqlite3/db.lock
similarity index 100%
rename from Mamoth/src/app/pages/register-new-account/register-new-account.component.css
rename to .vs/Mamoth/v15/Server/sqlite3/db.lock
diff --git a/.vs/Mamoth/v15/Server/sqlite3/storage.ide b/.vs/Mamoth/v15/Server/sqlite3/storage.ide
new file mode 100644
index 00000000..9065ddf8
Binary files /dev/null and b/.vs/Mamoth/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 00000000..6b611411
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,6 @@
+{
+ "ExpandedNodes": [
+ ""
+ ],
+ "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
new file mode 100644
index 00000000..f3e21da8
--- /dev/null
+++ b/.vs/config/applicationhost.config
@@ -0,0 +1,1021 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 00000000..2726613a
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/Mamoth.sln b/Mamoth.sln
deleted file mode 100644
index a7eff81e..00000000
--- a/Mamoth.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2002
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "Mamoth", "Mamoth\Mamoth.njsproj", "{3F3DF8F3-0772-43C1-84AE-BB5CDAE614A1}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {3F3DF8F3-0772-43C1-84AE-BB5CDAE614A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F3DF8F3-0772-43C1-84AE-BB5CDAE614A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3F3DF8F3-0772-43C1-84AE-BB5CDAE614A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3F3DF8F3-0772-43C1-84AE-BB5CDAE614A1}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {6F9185A5-C168-45D4-8206-0B341F5CD3A7}
- EndGlobalSection
-EndGlobal
diff --git a/Mamoth/.gitignore b/Mamoth/.gitignore
deleted file mode 100644
index eabf65e5..00000000
--- a/Mamoth/.gitignore
+++ /dev/null
@@ -1,44 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/dist-server
-/tmp
-/out-tsc
-
-# dependencies
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-yarn-error.log
-testem.log
-/typings
-
-# e2e
-/e2e/*.js
-/e2e/*.map
-
-# System Files
-.DS_Store
-Thumbs.db
diff --git a/Mamoth/Mamoth.njsproj b/Mamoth/Mamoth.njsproj
deleted file mode 100644
index 23ec0aa5..00000000
--- a/Mamoth/Mamoth.njsproj
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
- Mamoth
- Mamoth
- .\node_modules\electron\dist\electron.exe
- --inspect-brk
-
-
-
- Debug
- 2.0
- 3f3df8f3-0772-43c1-84ae-bb5cdae614a1
- .
- main.js
- False
-
-
- .
- .
- v4.0
- {3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}
- true
- CommonJS
- 2.6
- true
- False
-
-
- true
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
- True
- 0
- /
- http://localhost:48022/
- False
- True
- http://localhost:1337
- False
-
-
-
-
-
-
- CurrentPage
- True
- False
- False
- False
-
-
-
-
-
-
-
-
- False
- False
-
-
-
-
-
\ No newline at end of file
diff --git a/Mamoth/Mamoth.njsproj.user b/Mamoth/Mamoth.njsproj.user
deleted file mode 100644
index 55f44b95..00000000
--- a/Mamoth/Mamoth.njsproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
- ShowAllFiles
-
-
\ No newline at end of file
diff --git a/Mamoth/README.md b/Mamoth/README.md
deleted file mode 100644
index cdec8b07..00000000
--- a/Mamoth/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# PoC_ElectronAngularVS
-
-
diff --git a/Mamoth/angular.json b/angular.json
similarity index 100%
rename from Mamoth/angular.json
rename to angular.json
diff --git a/Mamoth/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
similarity index 100%
rename from Mamoth/e2e/app.e2e-spec.ts
rename to e2e/app.e2e-spec.ts
diff --git a/Mamoth/e2e/app.po.ts b/e2e/app.po.ts
similarity index 100%
rename from Mamoth/e2e/app.po.ts
rename to e2e/app.po.ts
diff --git a/Mamoth/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json
similarity index 100%
rename from Mamoth/e2e/tsconfig.e2e.json
rename to e2e/tsconfig.e2e.json
diff --git a/Mamoth/karma.conf.js b/karma.conf.js
similarity index 100%
rename from Mamoth/karma.conf.js
rename to karma.conf.js
diff --git a/Mamoth/main.js b/main.js
similarity index 100%
rename from Mamoth/main.js
rename to main.js
diff --git a/Mamoth/package-lock.json b/package-lock.json
similarity index 100%
rename from Mamoth/package-lock.json
rename to package-lock.json
diff --git a/Mamoth/package.json b/package.json
similarity index 100%
rename from Mamoth/package.json
rename to package.json
diff --git a/Mamoth/protractor.conf.js b/protractor.conf.js
similarity index 100%
rename from Mamoth/protractor.conf.js
rename to protractor.conf.js
diff --git a/Mamoth/src/app/app.component.css b/src/app/app.component.css
similarity index 100%
rename from Mamoth/src/app/app.component.css
rename to src/app/app.component.css
diff --git a/Mamoth/src/app/app.component.html b/src/app/app.component.html
similarity index 100%
rename from Mamoth/src/app/app.component.html
rename to src/app/app.component.html
diff --git a/Mamoth/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/app.component.spec.ts
rename to src/app/app.component.spec.ts
diff --git a/Mamoth/src/app/app.component.ts b/src/app/app.component.ts
similarity index 100%
rename from Mamoth/src/app/app.component.ts
rename to src/app/app.component.ts
diff --git a/Mamoth/src/app/app.module.ts b/src/app/app.module.ts
similarity index 100%
rename from Mamoth/src/app/app.module.ts
rename to src/app/app.module.ts
diff --git a/Mamoth/src/app/components/left-side-bar/left-side-bar.component.css b/src/app/components/left-side-bar/left-side-bar.component.css
similarity index 100%
rename from Mamoth/src/app/components/left-side-bar/left-side-bar.component.css
rename to src/app/components/left-side-bar/left-side-bar.component.css
diff --git a/Mamoth/src/app/components/left-side-bar/left-side-bar.component.html b/src/app/components/left-side-bar/left-side-bar.component.html
similarity index 100%
rename from Mamoth/src/app/components/left-side-bar/left-side-bar.component.html
rename to src/app/components/left-side-bar/left-side-bar.component.html
diff --git a/Mamoth/src/app/components/left-side-bar/left-side-bar.component.spec.ts b/src/app/components/left-side-bar/left-side-bar.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/components/left-side-bar/left-side-bar.component.spec.ts
rename to src/app/components/left-side-bar/left-side-bar.component.spec.ts
diff --git a/Mamoth/src/app/components/left-side-bar/left-side-bar.component.ts b/src/app/components/left-side-bar/left-side-bar.component.ts
similarity index 100%
rename from Mamoth/src/app/components/left-side-bar/left-side-bar.component.ts
rename to src/app/components/left-side-bar/left-side-bar.component.ts
diff --git a/Mamoth/src/app/components/stream/stream.component.css b/src/app/components/stream/stream.component.css
similarity index 100%
rename from Mamoth/src/app/components/stream/stream.component.css
rename to src/app/components/stream/stream.component.css
diff --git a/Mamoth/src/app/components/stream/stream.component.html b/src/app/components/stream/stream.component.html
similarity index 100%
rename from Mamoth/src/app/components/stream/stream.component.html
rename to src/app/components/stream/stream.component.html
diff --git a/Mamoth/src/app/components/stream/stream.component.spec.ts b/src/app/components/stream/stream.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/components/stream/stream.component.spec.ts
rename to src/app/components/stream/stream.component.spec.ts
diff --git a/Mamoth/src/app/components/stream/stream.component.ts b/src/app/components/stream/stream.component.ts
similarity index 100%
rename from Mamoth/src/app/components/stream/stream.component.ts
rename to src/app/components/stream/stream.component.ts
diff --git a/Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.css b/src/app/components/streams-selection-footer/streams-selection-footer.component.css
similarity index 100%
rename from Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.css
rename to src/app/components/streams-selection-footer/streams-selection-footer.component.css
diff --git a/Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.html b/src/app/components/streams-selection-footer/streams-selection-footer.component.html
similarity index 100%
rename from Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.html
rename to src/app/components/streams-selection-footer/streams-selection-footer.component.html
diff --git a/Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.spec.ts b/src/app/components/streams-selection-footer/streams-selection-footer.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.spec.ts
rename to src/app/components/streams-selection-footer/streams-selection-footer.component.spec.ts
diff --git a/Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.ts b/src/app/components/streams-selection-footer/streams-selection-footer.component.ts
similarity index 100%
rename from Mamoth/src/app/components/streams-selection-footer/streams-selection-footer.component.ts
rename to src/app/components/streams-selection-footer/streams-selection-footer.component.ts
diff --git a/Mamoth/src/app/components/toot/toot.component.css b/src/app/components/toot/toot.component.css
similarity index 100%
rename from Mamoth/src/app/components/toot/toot.component.css
rename to src/app/components/toot/toot.component.css
diff --git a/Mamoth/src/app/components/toot/toot.component.html b/src/app/components/toot/toot.component.html
similarity index 100%
rename from Mamoth/src/app/components/toot/toot.component.html
rename to src/app/components/toot/toot.component.html
diff --git a/Mamoth/src/app/components/toot/toot.component.spec.ts b/src/app/components/toot/toot.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/components/toot/toot.component.spec.ts
rename to src/app/components/toot/toot.component.spec.ts
diff --git a/Mamoth/src/app/components/toot/toot.component.ts b/src/app/components/toot/toot.component.ts
similarity index 100%
rename from Mamoth/src/app/components/toot/toot.component.ts
rename to src/app/components/toot/toot.component.ts
diff --git a/Mamoth/src/app/models/account.models.ts b/src/app/models/account.models.ts
similarity index 100%
rename from Mamoth/src/app/models/account.models.ts
rename to src/app/models/account.models.ts
diff --git a/Mamoth/src/app/models/stream.models.ts b/src/app/models/stream.models.ts
similarity index 100%
rename from Mamoth/src/app/models/stream.models.ts
rename to src/app/models/stream.models.ts
diff --git a/Mamoth/src/assets/.gitkeep b/src/app/pages/register-new-account/register-new-account.component.css
similarity index 100%
rename from Mamoth/src/assets/.gitkeep
rename to src/app/pages/register-new-account/register-new-account.component.css
diff --git a/Mamoth/src/app/pages/register-new-account/register-new-account.component.html b/src/app/pages/register-new-account/register-new-account.component.html
similarity index 100%
rename from Mamoth/src/app/pages/register-new-account/register-new-account.component.html
rename to src/app/pages/register-new-account/register-new-account.component.html
diff --git a/Mamoth/src/app/pages/register-new-account/register-new-account.component.spec.ts b/src/app/pages/register-new-account/register-new-account.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/pages/register-new-account/register-new-account.component.spec.ts
rename to src/app/pages/register-new-account/register-new-account.component.spec.ts
diff --git a/Mamoth/src/app/pages/register-new-account/register-new-account.component.ts b/src/app/pages/register-new-account/register-new-account.component.ts
similarity index 100%
rename from Mamoth/src/app/pages/register-new-account/register-new-account.component.ts
rename to src/app/pages/register-new-account/register-new-account.component.ts
diff --git a/Mamoth/src/app/pages/streams-main-display/streams-main-display.component.css b/src/app/pages/streams-main-display/streams-main-display.component.css
similarity index 100%
rename from Mamoth/src/app/pages/streams-main-display/streams-main-display.component.css
rename to src/app/pages/streams-main-display/streams-main-display.component.css
diff --git a/Mamoth/src/app/pages/streams-main-display/streams-main-display.component.html b/src/app/pages/streams-main-display/streams-main-display.component.html
similarity index 100%
rename from Mamoth/src/app/pages/streams-main-display/streams-main-display.component.html
rename to src/app/pages/streams-main-display/streams-main-display.component.html
diff --git a/Mamoth/src/app/pages/streams-main-display/streams-main-display.component.spec.ts b/src/app/pages/streams-main-display/streams-main-display.component.spec.ts
similarity index 100%
rename from Mamoth/src/app/pages/streams-main-display/streams-main-display.component.spec.ts
rename to src/app/pages/streams-main-display/streams-main-display.component.spec.ts
diff --git a/Mamoth/src/app/pages/streams-main-display/streams-main-display.component.ts b/src/app/pages/streams-main-display/streams-main-display.component.ts
similarity index 100%
rename from Mamoth/src/app/pages/streams-main-display/streams-main-display.component.ts
rename to src/app/pages/streams-main-display/streams-main-display.component.ts
diff --git a/Mamoth/src/app/services/accounts.service.ts b/src/app/services/accounts.service.ts
similarity index 100%
rename from Mamoth/src/app/services/accounts.service.ts
rename to src/app/services/accounts.service.ts
diff --git a/Mamoth/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
similarity index 100%
rename from Mamoth/src/app/services/auth.service.ts
rename to src/app/services/auth.service.ts
diff --git a/Mamoth/src/app/services/models/api.settings.ts b/src/app/services/models/api.settings.ts
similarity index 100%
rename from Mamoth/src/app/services/models/api.settings.ts
rename to src/app/services/models/api.settings.ts
diff --git a/Mamoth/src/app/services/models/mastodon.interfaces.ts b/src/app/services/models/mastodon.interfaces.ts
similarity index 100%
rename from Mamoth/src/app/services/models/mastodon.interfaces.ts
rename to src/app/services/models/mastodon.interfaces.ts
diff --git a/Mamoth/src/app/services/streaming.service.ts b/src/app/services/streaming.service.ts
similarity index 100%
rename from Mamoth/src/app/services/streaming.service.ts
rename to src/app/services/streaming.service.ts
diff --git a/Mamoth/src/app/services/streams.service.ts b/src/app/services/streams.service.ts
similarity index 100%
rename from Mamoth/src/app/services/streams.service.ts
rename to src/app/services/streams.service.ts
diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/Mamoth/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
similarity index 100%
rename from Mamoth/src/environments/environment.prod.ts
rename to src/environments/environment.prod.ts
diff --git a/Mamoth/src/environments/environment.ts b/src/environments/environment.ts
similarity index 100%
rename from Mamoth/src/environments/environment.ts
rename to src/environments/environment.ts
diff --git a/Mamoth/src/favicon.ico b/src/favicon.ico
similarity index 100%
rename from Mamoth/src/favicon.ico
rename to src/favicon.ico
diff --git a/Mamoth/src/index.html b/src/index.html
similarity index 100%
rename from Mamoth/src/index.html
rename to src/index.html
diff --git a/Mamoth/src/main.ts b/src/main.ts
similarity index 100%
rename from Mamoth/src/main.ts
rename to src/main.ts
diff --git a/Mamoth/src/polyfills.ts b/src/polyfills.ts
similarity index 100%
rename from Mamoth/src/polyfills.ts
rename to src/polyfills.ts
diff --git a/Mamoth/src/styles.css b/src/styles.css
similarity index 100%
rename from Mamoth/src/styles.css
rename to src/styles.css
diff --git a/Mamoth/src/test.ts b/src/test.ts
similarity index 100%
rename from Mamoth/src/test.ts
rename to src/test.ts
diff --git a/Mamoth/src/tsconfig.app.json b/src/tsconfig.app.json
similarity index 100%
rename from Mamoth/src/tsconfig.app.json
rename to src/tsconfig.app.json
diff --git a/Mamoth/src/tsconfig.spec.json b/src/tsconfig.spec.json
similarity index 100%
rename from Mamoth/src/tsconfig.spec.json
rename to src/tsconfig.spec.json
diff --git a/Mamoth/src/typings.d.ts b/src/typings.d.ts
similarity index 100%
rename from Mamoth/src/typings.d.ts
rename to src/typings.d.ts
diff --git a/Mamoth/tsconfig.json b/tsconfig.json
similarity index 100%
rename from Mamoth/tsconfig.json
rename to tsconfig.json
diff --git a/Mamoth/tslint.json b/tslint.json
similarity index 100%
rename from Mamoth/tslint.json
rename to tslint.json