From 47aa638fd8425e732d8d5078cdf53732a8a3600f Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sun, 6 Aug 2017 16:45:02 +0200 Subject: [PATCH 1/4] Moved eveything related to the api to a seperate folder seasoned_api. --- seasoned.md | 1 - package.json => seasoned_api/package.json | 6 +++--- {src => seasoned_api/src}/config/configuration.js | 0 {src => seasoned_api/src}/config/environmentVariables.js | 0 {src => seasoned_api/src}/config/field.js | 0 {src => seasoned_api/src}/config/filters.js | 0 {src => seasoned_api/src}/database/database.js | 0 {src => seasoned_api/src}/database/sqliteDatabase.js | 0 {src => seasoned_api/src}/git/gitRepository.js | 0 {src => seasoned_api/src}/media_classes/mediaInfo.js | 0 {src => seasoned_api/src}/media_classes/movie.js | 0 {src => seasoned_api/src}/media_classes/player.js | 0 {src => seasoned_api/src}/media_classes/user.js | 0 {src => seasoned_api/src}/plex/convertPlexToMovie.js | 0 {src => seasoned_api/src}/plex/convertPlexToStream.js | 0 {src => seasoned_api/src}/plex/convertStreamToMediaInfo.js | 0 {src => seasoned_api/src}/plex/hookDump.js | 0 {src => seasoned_api/src}/plex/mailTemplate.js | 0 {src => seasoned_api/src}/plex/plexRepository.js | 0 {src => seasoned_api/src}/plex/requestRepository.js | 0 .../src}/plex/stream/convertStreamToPlayback.js | 0 .../src}/plex/stream/convertStreamToPlayer.js | 0 .../src}/plex/stream/convertStreamToUser.js | 0 {src => seasoned_api/src}/seasoned/stray.js | 0 {src => seasoned_api/src}/seasoned/strayRepository.js | 0 {src => seasoned_api/src}/tmdb/convertTmdbToMovie.js | 0 {src => seasoned_api/src}/tmdb/tmdb.js | 0 seasoned_api/src/webserver/access.log | 4 ++++ {src => seasoned_api/src}/webserver/app.js | 0 .../src}/webserver/controllers/git/dumpHook.js | 0 .../src}/webserver/controllers/plex/hookDump.js | 0 .../src}/webserver/controllers/plex/plexPlaying.js | 0 .../src}/webserver/controllers/plex/readRequest.js | 0 .../src}/webserver/controllers/plex/searchMedia.js | 0 .../src}/webserver/controllers/plex/searchRequest.js | 0 .../src}/webserver/controllers/plex/submitRequest.js | 0 .../src}/webserver/controllers/seasoned/readStrays.js | 0 .../src}/webserver/controllers/seasoned/strayById.js | 0 .../src}/webserver/controllers/seasoned/verifyStray.js | 0 .../src}/webserver/controllers/tmdb/readMedia.js | 0 .../src}/webserver/controllers/tmdb/searchMedia.js | 0 {src => seasoned_api/src}/webserver/server.js | 0 yarn.lock => seasoned_api/yarn.lock | 0 webpage/js/env_variables.js | 3 --- 44 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 seasoned.md rename package.json => seasoned_api/package.json (69%) rename {src => seasoned_api/src}/config/configuration.js (100%) rename {src => seasoned_api/src}/config/environmentVariables.js (100%) rename {src => seasoned_api/src}/config/field.js (100%) rename {src => seasoned_api/src}/config/filters.js (100%) rename {src => seasoned_api/src}/database/database.js (100%) rename {src => seasoned_api/src}/database/sqliteDatabase.js (100%) rename {src => seasoned_api/src}/git/gitRepository.js (100%) rename {src => seasoned_api/src}/media_classes/mediaInfo.js (100%) rename {src => seasoned_api/src}/media_classes/movie.js (100%) rename {src => seasoned_api/src}/media_classes/player.js (100%) rename {src => seasoned_api/src}/media_classes/user.js (100%) rename {src => seasoned_api/src}/plex/convertPlexToMovie.js (100%) rename {src => seasoned_api/src}/plex/convertPlexToStream.js (100%) rename {src => seasoned_api/src}/plex/convertStreamToMediaInfo.js (100%) rename {src => seasoned_api/src}/plex/hookDump.js (100%) rename {src => seasoned_api/src}/plex/mailTemplate.js (100%) rename {src => seasoned_api/src}/plex/plexRepository.js (100%) rename {src => seasoned_api/src}/plex/requestRepository.js (100%) rename {src => seasoned_api/src}/plex/stream/convertStreamToPlayback.js (100%) rename {src => seasoned_api/src}/plex/stream/convertStreamToPlayer.js (100%) rename {src => seasoned_api/src}/plex/stream/convertStreamToUser.js (100%) rename {src => seasoned_api/src}/seasoned/stray.js (100%) rename {src => seasoned_api/src}/seasoned/strayRepository.js (100%) rename {src => seasoned_api/src}/tmdb/convertTmdbToMovie.js (100%) rename {src => seasoned_api/src}/tmdb/tmdb.js (100%) create mode 100644 seasoned_api/src/webserver/access.log rename {src => seasoned_api/src}/webserver/app.js (100%) rename {src => seasoned_api/src}/webserver/controllers/git/dumpHook.js (100%) rename {src => seasoned_api/src}/webserver/controllers/plex/hookDump.js (100%) rename {src => seasoned_api/src}/webserver/controllers/plex/plexPlaying.js (100%) rename {src => seasoned_api/src}/webserver/controllers/plex/readRequest.js (100%) rename {src => seasoned_api/src}/webserver/controllers/plex/searchMedia.js (100%) rename {src => seasoned_api/src}/webserver/controllers/plex/searchRequest.js (100%) rename {src => seasoned_api/src}/webserver/controllers/plex/submitRequest.js (100%) rename {src => seasoned_api/src}/webserver/controllers/seasoned/readStrays.js (100%) rename {src => seasoned_api/src}/webserver/controllers/seasoned/strayById.js (100%) rename {src => seasoned_api/src}/webserver/controllers/seasoned/verifyStray.js (100%) rename {src => seasoned_api/src}/webserver/controllers/tmdb/readMedia.js (100%) rename {src => seasoned_api/src}/webserver/controllers/tmdb/searchMedia.js (100%) rename {src => seasoned_api/src}/webserver/server.js (100%) rename yarn.lock => seasoned_api/yarn.lock (100%) delete mode 100644 webpage/js/env_variables.js diff --git a/seasoned.md b/seasoned.md deleted file mode 100644 index f1beec5..0000000 --- a/seasoned.md +++ /dev/null @@ -1 +0,0 @@ -So to get people to sign up for a account could be to have them sign up for shows that they can be alerted when are added. They can choose by SMS, twitter, email or maybe newsletter. \ No newline at end of file diff --git a/package.json b/seasoned_api/package.json similarity index 69% rename from package.json rename to seasoned_api/package.json index 85ee1e8..f56b2e3 100644 --- a/package.json +++ b/seasoned_api/package.json @@ -1,8 +1,8 @@ { - "name": "node-api", - "main": "src/webserver/server.js", + "name": "seasoned-api", + "main": "webserver/server.js", "scripts": { - "start": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/webserver/server.js" + "start": "cross-env SEASONED_CONFIG=../conf/development.json NODE_PATH=. node src/webserver/server.js" }, "dependencies": { "body-parser": "~1.0.1", diff --git a/src/config/configuration.js b/seasoned_api/src/config/configuration.js similarity index 100% rename from src/config/configuration.js rename to seasoned_api/src/config/configuration.js diff --git a/src/config/environmentVariables.js b/seasoned_api/src/config/environmentVariables.js similarity index 100% rename from src/config/environmentVariables.js rename to seasoned_api/src/config/environmentVariables.js diff --git a/src/config/field.js b/seasoned_api/src/config/field.js similarity index 100% rename from src/config/field.js rename to seasoned_api/src/config/field.js diff --git a/src/config/filters.js b/seasoned_api/src/config/filters.js similarity index 100% rename from src/config/filters.js rename to seasoned_api/src/config/filters.js diff --git a/src/database/database.js b/seasoned_api/src/database/database.js similarity index 100% rename from src/database/database.js rename to seasoned_api/src/database/database.js diff --git a/src/database/sqliteDatabase.js b/seasoned_api/src/database/sqliteDatabase.js similarity index 100% rename from src/database/sqliteDatabase.js rename to seasoned_api/src/database/sqliteDatabase.js diff --git a/src/git/gitRepository.js b/seasoned_api/src/git/gitRepository.js similarity index 100% rename from src/git/gitRepository.js rename to seasoned_api/src/git/gitRepository.js diff --git a/src/media_classes/mediaInfo.js b/seasoned_api/src/media_classes/mediaInfo.js similarity index 100% rename from src/media_classes/mediaInfo.js rename to seasoned_api/src/media_classes/mediaInfo.js diff --git a/src/media_classes/movie.js b/seasoned_api/src/media_classes/movie.js similarity index 100% rename from src/media_classes/movie.js rename to seasoned_api/src/media_classes/movie.js diff --git a/src/media_classes/player.js b/seasoned_api/src/media_classes/player.js similarity index 100% rename from src/media_classes/player.js rename to seasoned_api/src/media_classes/player.js diff --git a/src/media_classes/user.js b/seasoned_api/src/media_classes/user.js similarity index 100% rename from src/media_classes/user.js rename to seasoned_api/src/media_classes/user.js diff --git a/src/plex/convertPlexToMovie.js b/seasoned_api/src/plex/convertPlexToMovie.js similarity index 100% rename from src/plex/convertPlexToMovie.js rename to seasoned_api/src/plex/convertPlexToMovie.js diff --git a/src/plex/convertPlexToStream.js b/seasoned_api/src/plex/convertPlexToStream.js similarity index 100% rename from src/plex/convertPlexToStream.js rename to seasoned_api/src/plex/convertPlexToStream.js diff --git a/src/plex/convertStreamToMediaInfo.js b/seasoned_api/src/plex/convertStreamToMediaInfo.js similarity index 100% rename from src/plex/convertStreamToMediaInfo.js rename to seasoned_api/src/plex/convertStreamToMediaInfo.js diff --git a/src/plex/hookDump.js b/seasoned_api/src/plex/hookDump.js similarity index 100% rename from src/plex/hookDump.js rename to seasoned_api/src/plex/hookDump.js diff --git a/src/plex/mailTemplate.js b/seasoned_api/src/plex/mailTemplate.js similarity index 100% rename from src/plex/mailTemplate.js rename to seasoned_api/src/plex/mailTemplate.js diff --git a/src/plex/plexRepository.js b/seasoned_api/src/plex/plexRepository.js similarity index 100% rename from src/plex/plexRepository.js rename to seasoned_api/src/plex/plexRepository.js diff --git a/src/plex/requestRepository.js b/seasoned_api/src/plex/requestRepository.js similarity index 100% rename from src/plex/requestRepository.js rename to seasoned_api/src/plex/requestRepository.js diff --git a/src/plex/stream/convertStreamToPlayback.js b/seasoned_api/src/plex/stream/convertStreamToPlayback.js similarity index 100% rename from src/plex/stream/convertStreamToPlayback.js rename to seasoned_api/src/plex/stream/convertStreamToPlayback.js diff --git a/src/plex/stream/convertStreamToPlayer.js b/seasoned_api/src/plex/stream/convertStreamToPlayer.js similarity index 100% rename from src/plex/stream/convertStreamToPlayer.js rename to seasoned_api/src/plex/stream/convertStreamToPlayer.js diff --git a/src/plex/stream/convertStreamToUser.js b/seasoned_api/src/plex/stream/convertStreamToUser.js similarity index 100% rename from src/plex/stream/convertStreamToUser.js rename to seasoned_api/src/plex/stream/convertStreamToUser.js diff --git a/src/seasoned/stray.js b/seasoned_api/src/seasoned/stray.js similarity index 100% rename from src/seasoned/stray.js rename to seasoned_api/src/seasoned/stray.js diff --git a/src/seasoned/strayRepository.js b/seasoned_api/src/seasoned/strayRepository.js similarity index 100% rename from src/seasoned/strayRepository.js rename to seasoned_api/src/seasoned/strayRepository.js diff --git a/src/tmdb/convertTmdbToMovie.js b/seasoned_api/src/tmdb/convertTmdbToMovie.js similarity index 100% rename from src/tmdb/convertTmdbToMovie.js rename to seasoned_api/src/tmdb/convertTmdbToMovie.js diff --git a/src/tmdb/tmdb.js b/seasoned_api/src/tmdb/tmdb.js similarity index 100% rename from src/tmdb/tmdb.js rename to seasoned_api/src/tmdb/tmdb.js diff --git a/seasoned_api/src/webserver/access.log b/seasoned_api/src/webserver/access.log new file mode 100644 index 0000000..87ba069 --- /dev/null +++ b/seasoned_api/src/webserver/access.log @@ -0,0 +1,4 @@ +::1 - - [02/Jun/2017:06:34:49 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" +::1 - - [02/Jun/2017:06:34:50 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" +::1 - - [02/Jun/2017:06:45:59 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" +::1 - - [02/Jun/2017:06:48:30 +0000] "GET /api/v1/seasoned/all HTTP/1.1" 200 1016 "-" "curl/7.51.0" diff --git a/src/webserver/app.js b/seasoned_api/src/webserver/app.js similarity index 100% rename from src/webserver/app.js rename to seasoned_api/src/webserver/app.js diff --git a/src/webserver/controllers/git/dumpHook.js b/seasoned_api/src/webserver/controllers/git/dumpHook.js similarity index 100% rename from src/webserver/controllers/git/dumpHook.js rename to seasoned_api/src/webserver/controllers/git/dumpHook.js diff --git a/src/webserver/controllers/plex/hookDump.js b/seasoned_api/src/webserver/controllers/plex/hookDump.js similarity index 100% rename from src/webserver/controllers/plex/hookDump.js rename to seasoned_api/src/webserver/controllers/plex/hookDump.js diff --git a/src/webserver/controllers/plex/plexPlaying.js b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js similarity index 100% rename from src/webserver/controllers/plex/plexPlaying.js rename to seasoned_api/src/webserver/controllers/plex/plexPlaying.js diff --git a/src/webserver/controllers/plex/readRequest.js b/seasoned_api/src/webserver/controllers/plex/readRequest.js similarity index 100% rename from src/webserver/controllers/plex/readRequest.js rename to seasoned_api/src/webserver/controllers/plex/readRequest.js diff --git a/src/webserver/controllers/plex/searchMedia.js b/seasoned_api/src/webserver/controllers/plex/searchMedia.js similarity index 100% rename from src/webserver/controllers/plex/searchMedia.js rename to seasoned_api/src/webserver/controllers/plex/searchMedia.js diff --git a/src/webserver/controllers/plex/searchRequest.js b/seasoned_api/src/webserver/controllers/plex/searchRequest.js similarity index 100% rename from src/webserver/controllers/plex/searchRequest.js rename to seasoned_api/src/webserver/controllers/plex/searchRequest.js diff --git a/src/webserver/controllers/plex/submitRequest.js b/seasoned_api/src/webserver/controllers/plex/submitRequest.js similarity index 100% rename from src/webserver/controllers/plex/submitRequest.js rename to seasoned_api/src/webserver/controllers/plex/submitRequest.js diff --git a/src/webserver/controllers/seasoned/readStrays.js b/seasoned_api/src/webserver/controllers/seasoned/readStrays.js similarity index 100% rename from src/webserver/controllers/seasoned/readStrays.js rename to seasoned_api/src/webserver/controllers/seasoned/readStrays.js diff --git a/src/webserver/controllers/seasoned/strayById.js b/seasoned_api/src/webserver/controllers/seasoned/strayById.js similarity index 100% rename from src/webserver/controllers/seasoned/strayById.js rename to seasoned_api/src/webserver/controllers/seasoned/strayById.js diff --git a/src/webserver/controllers/seasoned/verifyStray.js b/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js similarity index 100% rename from src/webserver/controllers/seasoned/verifyStray.js rename to seasoned_api/src/webserver/controllers/seasoned/verifyStray.js diff --git a/src/webserver/controllers/tmdb/readMedia.js b/seasoned_api/src/webserver/controllers/tmdb/readMedia.js similarity index 100% rename from src/webserver/controllers/tmdb/readMedia.js rename to seasoned_api/src/webserver/controllers/tmdb/readMedia.js diff --git a/src/webserver/controllers/tmdb/searchMedia.js b/seasoned_api/src/webserver/controllers/tmdb/searchMedia.js similarity index 100% rename from src/webserver/controllers/tmdb/searchMedia.js rename to seasoned_api/src/webserver/controllers/tmdb/searchMedia.js diff --git a/src/webserver/server.js b/seasoned_api/src/webserver/server.js similarity index 100% rename from src/webserver/server.js rename to seasoned_api/src/webserver/server.js diff --git a/yarn.lock b/seasoned_api/yarn.lock similarity index 100% rename from yarn.lock rename to seasoned_api/yarn.lock diff --git a/webpage/js/env_variables.js b/webpage/js/env_variables.js deleted file mode 100644 index 5085590..0000000 --- a/webpage/js/env_variables.js +++ /dev/null @@ -1,3 +0,0 @@ -var env_variables = { - url : "http://10.0.0.41:31459/api/v1/seasoned/", -} From b8d01fcf1cf5ba52faeacdd11fcd27a60201405a Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Mon, 14 Aug 2017 22:33:28 +0200 Subject: [PATCH 2/4] Changed filename for moveSeasoned to include dir --- seasoned_api/src/seasoned/strayRepository.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seasoned_api/src/seasoned/strayRepository.js b/seasoned_api/src/seasoned/strayRepository.js index 4f688ac..e98a919 100644 --- a/seasoned_api/src/seasoned/strayRepository.js +++ b/seasoned_api/src/seasoned/strayRepository.js @@ -51,7 +51,7 @@ class StrayRepository { args: [strayId] } - pythonShell.run('moveSeasoned.py', options, function (err, results) { + pythonShell.run('app/moveSeasoned.py', options, function (err, results) { if (err) throw err; // TODO Add error handling!! StrayRepository.ERROR // results is an array consisting of messages collected during execution From d2bed84ecb7debf13824244f684f76e1d248a2c2 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Mon, 14 Aug 2017 22:42:24 +0200 Subject: [PATCH 3/4] Moved conf folder to seasoned_api --- seasoned_api/conf/development.json | 16 ++++++++++++++++ seasoned_api/package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 seasoned_api/conf/development.json diff --git a/seasoned_api/conf/development.json b/seasoned_api/conf/development.json new file mode 100644 index 0000000..e5d2fe1 --- /dev/null +++ b/seasoned_api/conf/development.json @@ -0,0 +1,16 @@ +{ + "database": { + "host": "shows.db" + }, + "webserver": { + "port": 31459 + }, + "tmdb": { + "apiKey": "9fa154f5355c37a1b9b57ac06e7d6712" + }, + "mail": { + "host": "mail.kevinmidboe.com", + "user": "kevinmidboe", + "password": "Kevinojm94" + } +} diff --git a/seasoned_api/package.json b/seasoned_api/package.json index f56b2e3..3ec5c86 100644 --- a/seasoned_api/package.json +++ b/seasoned_api/package.json @@ -2,7 +2,7 @@ "name": "seasoned-api", "main": "webserver/server.js", "scripts": { - "start": "cross-env SEASONED_CONFIG=../conf/development.json NODE_PATH=. node src/webserver/server.js" + "start": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/webserver/server.js" }, "dependencies": { "body-parser": "~1.0.1", From ea97a0b4aff7d6cb470198e87ce3df7b81ea067b Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Mon, 14 Aug 2017 22:42:48 +0200 Subject: [PATCH 4/4] Moved all python related scripts to app directory --- classedStray.py => app/classedStray.py | 0 {conf => app/conf}/classedOutput.log | 0 {modules => app/modules}/addSubLanguage.py | 0 {modules => app/modules}/createPasteee.py | 0 {modules => app/modules}/dirHash.py | 0 {modules => app/modules}/folderCreator.py | 0 {modules => app/modules}/pasteee.py | 0 {modules => app/modules}/readDB.py | 0 {modules => app/modules}/removeUploader.py | 0 {modules => app/modules}/seasonedFolders.py | 0 {modules => app/modules}/subLangfinder.py | 0 .../modules}/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv].srt | 0 .../subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv]ENGLUISH.srt | 0 {modules => app/modules}/tweetNewEpisodes.py | 0 {modules => app/modules}/twitterConversation.py | 0 moveSeasoned.py => app/moveSeasoned.py | 0 seasonMover.py => app/seasonMover.py | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename classedStray.py => app/classedStray.py (100%) rename {conf => app/conf}/classedOutput.log (100%) rename {modules => app/modules}/addSubLanguage.py (100%) rename {modules => app/modules}/createPasteee.py (100%) rename {modules => app/modules}/dirHash.py (100%) rename {modules => app/modules}/folderCreator.py (100%) rename {modules => app/modules}/pasteee.py (100%) rename {modules => app/modules}/readDB.py (100%) rename {modules => app/modules}/removeUploader.py (100%) rename {modules => app/modules}/seasonedFolders.py (100%) rename {modules => app/modules}/subLangfinder.py (100%) rename {modules => app/modules}/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv].srt (100%) rename {modules => app/modules}/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv]ENGLUISH.srt (100%) rename {modules => app/modules}/tweetNewEpisodes.py (100%) rename {modules => app/modules}/twitterConversation.py (100%) rename moveSeasoned.py => app/moveSeasoned.py (100%) rename seasonMover.py => app/seasonMover.py (100%) diff --git a/classedStray.py b/app/classedStray.py similarity index 100% rename from classedStray.py rename to app/classedStray.py diff --git a/conf/classedOutput.log b/app/conf/classedOutput.log similarity index 100% rename from conf/classedOutput.log rename to app/conf/classedOutput.log diff --git a/modules/addSubLanguage.py b/app/modules/addSubLanguage.py similarity index 100% rename from modules/addSubLanguage.py rename to app/modules/addSubLanguage.py diff --git a/modules/createPasteee.py b/app/modules/createPasteee.py similarity index 100% rename from modules/createPasteee.py rename to app/modules/createPasteee.py diff --git a/modules/dirHash.py b/app/modules/dirHash.py similarity index 100% rename from modules/dirHash.py rename to app/modules/dirHash.py diff --git a/modules/folderCreator.py b/app/modules/folderCreator.py similarity index 100% rename from modules/folderCreator.py rename to app/modules/folderCreator.py diff --git a/modules/pasteee.py b/app/modules/pasteee.py similarity index 100% rename from modules/pasteee.py rename to app/modules/pasteee.py diff --git a/modules/readDB.py b/app/modules/readDB.py similarity index 100% rename from modules/readDB.py rename to app/modules/readDB.py diff --git a/modules/removeUploader.py b/app/modules/removeUploader.py similarity index 100% rename from modules/removeUploader.py rename to app/modules/removeUploader.py diff --git a/modules/seasonedFolders.py b/app/modules/seasonedFolders.py similarity index 100% rename from modules/seasonedFolders.py rename to app/modules/seasonedFolders.py diff --git a/modules/subLangfinder.py b/app/modules/subLangfinder.py similarity index 100% rename from modules/subLangfinder.py rename to app/modules/subLangfinder.py diff --git a/modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv].srt b/app/modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv].srt similarity index 100% rename from modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv].srt rename to app/modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv].srt diff --git a/modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv]ENGLUISH.srt b/app/modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv]ENGLUISH.srt similarity index 100% rename from modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv]ENGLUISH.srt rename to app/modules/subs/The.Man.from.U.N.C.L.E.2015.1080p-[eztv]ENGLUISH.srt diff --git a/modules/tweetNewEpisodes.py b/app/modules/tweetNewEpisodes.py similarity index 100% rename from modules/tweetNewEpisodes.py rename to app/modules/tweetNewEpisodes.py diff --git a/modules/twitterConversation.py b/app/modules/twitterConversation.py similarity index 100% rename from modules/twitterConversation.py rename to app/modules/twitterConversation.py diff --git a/moveSeasoned.py b/app/moveSeasoned.py similarity index 100% rename from moveSeasoned.py rename to app/moveSeasoned.py diff --git a/seasonMover.py b/app/seasonMover.py similarity index 100% rename from seasonMover.py rename to app/seasonMover.py