diff --git a/conf.dev/nginx.conf b/conf.dev/nginx.conf new file mode 100644 index 0000000..2a7373f --- /dev/null +++ b/conf.dev/nginx.conf @@ -0,0 +1,38 @@ +upstream it-radio-uwsgi { + server unix:///usr/local/flexites/projects_ext/it-radio/var/run/uwsgi.sock; +} + +server { + listen 80; + + access_log /usr/local/flexites/projects_ext/it-radio/var/log/nginx.access.log main; + error_log /usr/local/flexites/projects_ext/id-radio/var/log/nginx.error.log; + + location / { + root /usr/local/flexites/projects_ext/it-radio/client/dist; + index index.html; + access_log off; + expires 0; + } + + location /api { + root /usr/local/flexites/projects_ext/it-radio/server/proj; + uwsgi_pass it-radio-uwsgi; + include uwsgi_params; + uwsgi_read_timeout 60s; + uwsgi_send_timeout 60s; + } + + location /media { + alias /usr/local/flexites/projects_ext/it-radio/server/proj/media; + access_log off; + expires 0; + } + + location /static { + alias /usr/local/flexites/projects_ext/it-radio/server/proj/static; + access_log off; + expires 0; + } + +} \ No newline at end of file diff --git a/conf.dev/supervisor-uwsgi.conf b/conf.dev/supervisor-uwsgi.conf new file mode 100644 index 0000000..9c29d1f --- /dev/null +++ b/conf.dev/supervisor-uwsgi.conf @@ -0,0 +1,19 @@ +[program:it-radio-uwsgi] +command = /usr/local/flexites/projects_ext/it-radio/server/env/bin/uwsgi --ini /usr/local/flexites/projects_ext/it-radio/conf.dev/uwsgi.ini +user = www-data +stdout_logfile = /usr/local/flexites/projects_ext/it-radio/var/log/uwsgi.log +stdout_logfile_maxbytes = 10MB +stderr_logfile = /usr/local/flexites/projects_ext/it-radio/var/log/uwsgi.error.log +stderr_logfile_maxbytes = 10MB +startsecs = 0 +autostart = true +autorestart = true +redirect_stderr = false +priority = 999 +stopsignal = QUIT + + + + + + diff --git a/conf.dev/uwsgi.ini b/conf.dev/uwsgi.ini new file mode 100644 index 0000000..5f049a7 --- /dev/null +++ b/conf.dev/uwsgi.ini @@ -0,0 +1,21 @@ +[uwsgi] + socket = /usr/local/flexites/projects_ext/it-radio/var/run/uwsgi.sock + pythonpath = /usr/local/flexites/projects_ext/it-radio/server/proj/ + module = conf.wsgi + uid = www-data + gid = www-data + chmod-socket = 666 + virtualenv = /usr/local/flexites/projects_ext/it-radio/server/env + env = LANG=ru_RU.UTF-8 + processes = 2 + master = true + max-requests = 1000 + harakiri = 60 + http-timeout = 60 + socket-timeout = 60 + no-orphans = true + reload-mercy = 8 + touch-reload = /usr/local/flexites/projects_ext/it-radio/var/run/reload + post-buffering = 8192 + buffer-size = 32768 + uid = 33 \ No newline at end of file diff --git a/server/ITRadioBackend/__init__.py b/server/proj/api/__init__.py similarity index 100% rename from server/ITRadioBackend/__init__.py rename to server/proj/api/__init__.py diff --git a/server/api/admin.py b/server/proj/api/admin.py similarity index 100% rename from server/api/admin.py rename to server/proj/api/admin.py diff --git a/server/api/apps.py b/server/proj/api/apps.py similarity index 100% rename from server/api/apps.py rename to server/proj/api/apps.py diff --git a/server/api/migrations/0001_initial.py b/server/proj/api/migrations/0001_initial.py similarity index 100% rename from server/api/migrations/0001_initial.py rename to server/proj/api/migrations/0001_initial.py diff --git a/server/api/migrations/0002_remove_nowplayingsong_duration.py b/server/proj/api/migrations/0002_remove_nowplayingsong_duration.py similarity index 100% rename from server/api/migrations/0002_remove_nowplayingsong_duration.py rename to server/proj/api/migrations/0002_remove_nowplayingsong_duration.py diff --git a/server/api/migrations/0003_rename_art_url_nowplayingsong_art.py b/server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py similarity index 100% rename from server/api/migrations/0003_rename_art_url_nowplayingsong_art.py rename to server/proj/api/migrations/0003_rename_art_url_nowplayingsong_art.py diff --git a/server/api/migrations/0004_delete_nowplayingsong.py b/server/proj/api/migrations/0004_delete_nowplayingsong.py similarity index 100% rename from server/api/migrations/0004_delete_nowplayingsong.py rename to server/proj/api/migrations/0004_delete_nowplayingsong.py diff --git a/server/api/__init__.py b/server/proj/api/migrations/__init__.py similarity index 100% rename from server/api/__init__.py rename to server/proj/api/migrations/__init__.py diff --git a/server/api/models.py b/server/proj/api/models.py similarity index 100% rename from server/api/models.py rename to server/proj/api/models.py diff --git a/server/api/serializers.py b/server/proj/api/serializers.py similarity index 100% rename from server/api/serializers.py rename to server/proj/api/serializers.py diff --git a/server/api/tests.py b/server/proj/api/tests.py similarity index 100% rename from server/api/tests.py rename to server/proj/api/tests.py diff --git a/server/api/views.py b/server/proj/api/views.py similarity index 100% rename from server/api/views.py rename to server/proj/api/views.py diff --git a/server/api/migrations/__init__.py b/server/proj/audio/__init__.py similarity index 100% rename from server/api/migrations/__init__.py rename to server/proj/audio/__init__.py diff --git a/server/loginApi/admin.py b/server/proj/audio/admin.py similarity index 100% rename from server/loginApi/admin.py rename to server/proj/audio/admin.py diff --git a/server/media/apps.py b/server/proj/audio/apps.py similarity index 100% rename from server/media/apps.py rename to server/proj/audio/apps.py diff --git a/server/loginApi/__init__.py b/server/proj/audio/migrations/__init__.py similarity index 100% rename from server/loginApi/__init__.py rename to server/proj/audio/migrations/__init__.py diff --git a/server/media/models.py b/server/proj/audio/models.py similarity index 100% rename from server/media/models.py rename to server/proj/audio/models.py diff --git a/server/loginApi/tests.py b/server/proj/audio/tests.py similarity index 100% rename from server/loginApi/tests.py rename to server/proj/audio/tests.py diff --git a/server/media/views.py b/server/proj/audio/views.py similarity index 100% rename from server/media/views.py rename to server/proj/audio/views.py diff --git a/server/loginApi/migrations/__init__.py b/server/proj/conf/__init__.py similarity index 100% rename from server/loginApi/migrations/__init__.py rename to server/proj/conf/__init__.py diff --git a/server/ITRadioBackend/__pycache__/__init__.cpython-310.pyc b/server/proj/conf/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/ITRadioBackend/__pycache__/__init__.cpython-310.pyc rename to server/proj/conf/__pycache__/__init__.cpython-310.pyc diff --git a/server/ITRadioBackend/__pycache__/settings.cpython-310.pyc b/server/proj/conf/__pycache__/settings.cpython-310.pyc similarity index 100% rename from server/ITRadioBackend/__pycache__/settings.cpython-310.pyc rename to server/proj/conf/__pycache__/settings.cpython-310.pyc diff --git a/server/ITRadioBackend/__pycache__/urls.cpython-310.pyc b/server/proj/conf/__pycache__/urls.cpython-310.pyc similarity index 100% rename from server/ITRadioBackend/__pycache__/urls.cpython-310.pyc rename to server/proj/conf/__pycache__/urls.cpython-310.pyc diff --git a/server/ITRadioBackend/__pycache__/wsgi.cpython-310.pyc b/server/proj/conf/__pycache__/wsgi.cpython-310.pyc similarity index 100% rename from server/ITRadioBackend/__pycache__/wsgi.cpython-310.pyc rename to server/proj/conf/__pycache__/wsgi.cpython-310.pyc diff --git a/server/ITRadioBackend/asgi.py b/server/proj/conf/asgi.py similarity index 100% rename from server/ITRadioBackend/asgi.py rename to server/proj/conf/asgi.py diff --git a/server/proj/conf/sentry.py b/server/proj/conf/sentry.py new file mode 100644 index 0000000..07ceedd --- /dev/null +++ b/server/proj/conf/sentry.py @@ -0,0 +1,29 @@ +import logging +import sentry_sdk +from sentry_sdk.integrations.django import DjangoIntegration +from sentry_sdk.integrations.logging import LoggingIntegration + + +SENTRY_CONFIG = { + 'dsn': "https://8b9022772a4e46eb80bee3d16f28fb86@jora.flexites.org/7", + 'integrations': [ + DjangoIntegration(), + LoggingIntegration( + level=logging.INFO, # Capture info and above as breadcrumbs + event_level=logging.ERROR # Send errors as events + ), + LoggingIntegration( + level=logging.INFO, # Capture info and above as breadcrumbs + event_level=logging.WARNING # Send errors as events + ) + ], + 'traces_sample_rate': 1.0, + 'send_default_pii': True, + 'environment': 'production' +} + + +def sentry_start(sentry_config=None): + if sentry_config is None: + sentry_config = SENTRY_CONFIG + return sentry_sdk.init(sentry_config) diff --git a/server/proj/conf/settings/__init__.dev.py b/server/proj/conf/settings/__init__.dev.py new file mode 100644 index 0000000..79be197 --- /dev/null +++ b/server/proj/conf/settings/__init__.dev.py @@ -0,0 +1 @@ +from .development import * diff --git a/server/proj/conf/settings/__init__.prod.py b/server/proj/conf/settings/__init__.prod.py new file mode 100644 index 0000000..4a73b03 --- /dev/null +++ b/server/proj/conf/settings/__init__.prod.py @@ -0,0 +1 @@ +from .production import * diff --git a/server/proj/conf/settings/__init__.py b/server/proj/conf/settings/__init__.py new file mode 100644 index 0000000..773cfc4 --- /dev/null +++ b/server/proj/conf/settings/__init__.py @@ -0,0 +1 @@ +from .base import * \ No newline at end of file diff --git a/server/ITRadioBackend/settings.py b/server/proj/conf/settings/base.py similarity index 56% rename from server/ITRadioBackend/settings.py rename to server/proj/conf/settings/base.py index 5fb4b11..6f9f209 100644 --- a/server/ITRadioBackend/settings.py +++ b/server/proj/conf/settings/base.py @@ -1,49 +1,26 @@ -""" -Django settings for ITRadioBackend project. - -Generated by 'django-admin startproject' using Django 5.0.4. - -For more information on this file, see -https://docs.djangoproject.com/en/5.0/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/5.0/ref/settings/ -""" - from pathlib import Path import os # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent +ROOT_DIR = BASE_DIR.parent.parent.parent +PROJECT_DIR = BASE_DIR.parent +LOG_ROOT = ROOT_DIR / 'var' / 'log' +RUN_ROOT = ROOT_DIR / 'var' / 'run' +TMP_ROOT = ROOT_DIR / 'var' / 'tmp' -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ - +MEDIA_ROOT = PROJECT_DIR / 'media' +MEDIA_URL = 'media/' +STATIC_ROOT = PROJECT_DIR / 'static' +STATIC_URL = 'static/' # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = 'django-insecure-z242=*-knp4h=0l1*o-nyid^y0bwt4bvg3tf*wvr(qszj&!8$c' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False -if DEBUG: - ALLOWED_HOSTS = ['*'] -else: - ALLOWED_HOSTS = ['83.147.244.32', 'localhost'] - -STATIC_URL = '/static/' -if DEBUG: - STATIC_DIR = os.path.join(BASE_DIR, 'static') - STATICFILES_DIRS = [ - STATIC_DIR, - '/var/www/static/', - ] -else: - STATIC_ROOT = os.path.join(BASE_DIR, 'static/') - STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - ) -MEDIA_URL = '/media/' +DEBUG = True +ALLOWED_HOSTS = ['*'] +CORS_ORIGIN_ALLOW_ALL = True # Application definition @@ -65,6 +42,9 @@ INSTALLED_APPS = [ 'rubricks', 'loginApi', 'userProfile', + 'sheduler', + 'audio', + 'api' ] @@ -79,7 +59,7 @@ MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', ] -ROOT_URLCONF = 'ITRadioBackend.urls' +ROOT_URLCONF = 'conf.urls' TEMPLATES = [ { @@ -97,22 +77,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'ITRadioBackend.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/5.0/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - -# Password validation -# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators +WSGI_APPLICATION = 'conf.wsgi.application' AUTH_PASSWORD_VALIDATORS = [ { @@ -141,17 +106,74 @@ USE_I18N = True USE_TZ = True - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/5.0/howto/static-files/ - -STATIC_URL = 'static/' - -# Default primary key field type -# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field - DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +ROTATE_LOG_SIZE = 15 * 1024 * 1024 +ROTATE_LOG_COUNT = 10 + +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '{levelname} {asctime} {module}:{lineno} {message}', + 'style': '{', + 'datefmt': '%Y-%m-%d %H:%M:%S', + }, + 'extended': { + 'format': '{levelname} {asctime} {message}', + 'style': '{', + 'datefmt': '%Y-%m-%d %H:%M:%S', + }, + 'simple': { + 'format': '{levelname} {message}', + 'style': '{', + }, + }, + 'handlers': { + 'update_history': { + 'level': 'DEBUG', + 'class': 'logging.handlers.RotatingFileHandler', + 'filename': LOG_ROOT / 'update_history.log', + 'formatter': 'extended', + 'maxBytes': ROTATE_LOG_SIZE, + 'backupCount': ROTATE_LOG_COUNT, + }, + 'upload_media': { + 'level': 'DEBUG', + 'class': 'logging.handlers.RotatingFileHandler', + 'filename': LOG_ROOT / 'upload_media.log', + 'formatter': 'extended', + 'maxBytes': ROTATE_LOG_SIZE, + 'backupCount': ROTATE_LOG_COUNT, + }, + 'banking': { + 'level': 'DEBUG', + 'class': 'logging.handlers.RotatingFileHandler', + 'filename': LOG_ROOT / 'banking.log', + 'formatter': 'extended', + 'maxBytes': ROTATE_LOG_SIZE, + 'backupCount': ROTATE_LOG_COUNT, + }, + }, + 'loggers': { + 'update_history': { + 'handlers': ['update_history', ], + 'level': 'INFO', + 'propagate': False, + }, + 'upload_media': { + 'handlers': ['upload_media', ], + 'level': 'INFO', + 'propagate': False, + }, + 'banking': { + 'handlers': ['banking'], + 'level': 'INFO', + 'propagate': False, + }, + }, +} REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ @@ -163,6 +185,7 @@ REST_FRAMEWORK = { ), 'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema' } + CORS_ALLOWED_ORIGINS = [ 'http://localhost:5173', # Adjust the port if your Vue app is served on a different one 'http://127.0.0.1:5173', diff --git a/server/proj/conf/settings/development.py b/server/proj/conf/settings/development.py new file mode 100644 index 0000000..fe0a43a --- /dev/null +++ b/server/proj/conf/settings/development.py @@ -0,0 +1,22 @@ +import sys +from .base import * + +DEBUG = True +ALLOWED_HOSTS = ['*'] + +# Database +# https://docs.djangoproject.com/en/3.2/ref/settings/#databases +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + +REST_FRAMEWORK['DEFAULT_PERMISSION_CLASSES'] = ('rest_framework.permissions.AllowAny',) + +if len(sys.argv) >= 2 and not sys.argv[0].endswith('manage.py'): + from conf.sentry import sentry_start, SENTRY_CONFIG + + SENTRY_CONFIG['environment'] = 'development' + sentry_start(SENTRY_CONFIG) diff --git a/server/proj/conf/settings/production.py b/server/proj/conf/settings/production.py new file mode 100644 index 0000000..e7c3dd3 --- /dev/null +++ b/server/proj/conf/settings/production.py @@ -0,0 +1,22 @@ +import sys +from .base import * + +DEBUG = False +ALLOWED_HOSTS = ['*'] + +# Database +# https://docs.djangoproject.com/en/3.2/ref/settings/#databases +""" DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'ldirect', + 'USER': 'flexites', + 'PASSWORD': 'flexites', + 'HOST': 'localhost', + }, +} """ + +if len(sys.argv) >= 2 and sys.argv[1] != 'runserver': + from conf.sentry import sentry_start, SENTRY_CONFIG + + sentry_start(SENTRY_CONFIG) diff --git a/server/ITRadioBackend/urls.py b/server/proj/conf/urls.py similarity index 100% rename from server/ITRadioBackend/urls.py rename to server/proj/conf/urls.py diff --git a/server/ITRadioBackend/wsgi.py b/server/proj/conf/wsgi.py similarity index 100% rename from server/ITRadioBackend/wsgi.py rename to server/proj/conf/wsgi.py diff --git a/server/media/__init__.py b/server/proj/loginApi/__init__.py similarity index 100% rename from server/media/__init__.py rename to server/proj/loginApi/__init__.py diff --git a/server/loginApi/__pycache__/__init__.cpython-310.pyc b/server/proj/loginApi/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/loginApi/__pycache__/__init__.cpython-310.pyc rename to server/proj/loginApi/__pycache__/__init__.cpython-310.pyc diff --git a/server/loginApi/__pycache__/admin.cpython-310.pyc b/server/proj/loginApi/__pycache__/admin.cpython-310.pyc similarity index 100% rename from server/loginApi/__pycache__/admin.cpython-310.pyc rename to server/proj/loginApi/__pycache__/admin.cpython-310.pyc diff --git a/server/loginApi/__pycache__/apps.cpython-310.pyc b/server/proj/loginApi/__pycache__/apps.cpython-310.pyc similarity index 100% rename from server/loginApi/__pycache__/apps.cpython-310.pyc rename to server/proj/loginApi/__pycache__/apps.cpython-310.pyc diff --git a/server/loginApi/__pycache__/models.cpython-310.pyc b/server/proj/loginApi/__pycache__/models.cpython-310.pyc similarity index 100% rename from server/loginApi/__pycache__/models.cpython-310.pyc rename to server/proj/loginApi/__pycache__/models.cpython-310.pyc diff --git a/server/loginApi/__pycache__/serializers.cpython-310.pyc b/server/proj/loginApi/__pycache__/serializers.cpython-310.pyc similarity index 100% rename from server/loginApi/__pycache__/serializers.cpython-310.pyc rename to server/proj/loginApi/__pycache__/serializers.cpython-310.pyc diff --git a/server/loginApi/__pycache__/views.cpython-310.pyc b/server/proj/loginApi/__pycache__/views.cpython-310.pyc similarity index 100% rename from server/loginApi/__pycache__/views.cpython-310.pyc rename to server/proj/loginApi/__pycache__/views.cpython-310.pyc diff --git a/server/media/admin.py b/server/proj/loginApi/admin.py similarity index 100% rename from server/media/admin.py rename to server/proj/loginApi/admin.py diff --git a/server/loginApi/apps.py b/server/proj/loginApi/apps.py similarity index 100% rename from server/loginApi/apps.py rename to server/proj/loginApi/apps.py diff --git a/server/media/migrations/__init__.py b/server/proj/loginApi/migrations/__init__.py similarity index 100% rename from server/media/migrations/__init__.py rename to server/proj/loginApi/migrations/__init__.py diff --git a/server/loginApi/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/loginApi/migrations/__pycache__/__init__.cpython-310.pyc rename to server/proj/loginApi/migrations/__pycache__/__init__.cpython-310.pyc diff --git a/server/loginApi/models.py b/server/proj/loginApi/models.py similarity index 100% rename from server/loginApi/models.py rename to server/proj/loginApi/models.py diff --git a/server/loginApi/serializers.py b/server/proj/loginApi/serializers.py similarity index 100% rename from server/loginApi/serializers.py rename to server/proj/loginApi/serializers.py diff --git a/server/media/tests.py b/server/proj/loginApi/tests.py similarity index 100% rename from server/media/tests.py rename to server/proj/loginApi/tests.py diff --git a/server/loginApi/views.py b/server/proj/loginApi/views.py similarity index 100% rename from server/loginApi/views.py rename to server/proj/loginApi/views.py diff --git a/server/manage.py b/server/proj/manage.py similarity index 100% rename from server/manage.py rename to server/proj/manage.py diff --git a/server/news/__init__.py b/server/proj/news/__init__.py similarity index 100% rename from server/news/__init__.py rename to server/proj/news/__init__.py diff --git a/server/news/__pycache__/__init__.cpython-310.pyc b/server/proj/news/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/news/__pycache__/__init__.cpython-310.pyc rename to server/proj/news/__pycache__/__init__.cpython-310.pyc diff --git a/server/news/__pycache__/admin.cpython-310.pyc b/server/proj/news/__pycache__/admin.cpython-310.pyc similarity index 100% rename from server/news/__pycache__/admin.cpython-310.pyc rename to server/proj/news/__pycache__/admin.cpython-310.pyc diff --git a/server/news/__pycache__/apps.cpython-310.pyc b/server/proj/news/__pycache__/apps.cpython-310.pyc similarity index 100% rename from server/news/__pycache__/apps.cpython-310.pyc rename to server/proj/news/__pycache__/apps.cpython-310.pyc diff --git a/server/news/__pycache__/models.cpython-310.pyc b/server/proj/news/__pycache__/models.cpython-310.pyc similarity index 100% rename from server/news/__pycache__/models.cpython-310.pyc rename to server/proj/news/__pycache__/models.cpython-310.pyc diff --git a/server/news/__pycache__/serializers.cpython-310.pyc b/server/proj/news/__pycache__/serializers.cpython-310.pyc similarity index 100% rename from server/news/__pycache__/serializers.cpython-310.pyc rename to server/proj/news/__pycache__/serializers.cpython-310.pyc diff --git a/server/news/__pycache__/views.cpython-310.pyc b/server/proj/news/__pycache__/views.cpython-310.pyc similarity index 100% rename from server/news/__pycache__/views.cpython-310.pyc rename to server/proj/news/__pycache__/views.cpython-310.pyc diff --git a/server/news/admin.py b/server/proj/news/admin.py similarity index 100% rename from server/news/admin.py rename to server/proj/news/admin.py diff --git a/server/news/apps.py b/server/proj/news/apps.py similarity index 100% rename from server/news/apps.py rename to server/proj/news/apps.py diff --git a/server/news/migrations/0001_initial.py b/server/proj/news/migrations/0001_initial.py similarity index 100% rename from server/news/migrations/0001_initial.py rename to server/proj/news/migrations/0001_initial.py diff --git a/server/news/migrations/0002_alter_news_author_alter_news_date.py b/server/proj/news/migrations/0002_alter_news_author_alter_news_date.py similarity index 100% rename from server/news/migrations/0002_alter_news_author_alter_news_date.py rename to server/proj/news/migrations/0002_alter_news_author_alter_news_date.py diff --git a/server/news/migrations/__init__.py b/server/proj/news/migrations/__init__.py similarity index 100% rename from server/news/migrations/__init__.py rename to server/proj/news/migrations/__init__.py diff --git a/server/news/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/news/migrations/__pycache__/0001_initial.cpython-310.pyc similarity index 100% rename from server/news/migrations/__pycache__/0001_initial.cpython-310.pyc rename to server/proj/news/migrations/__pycache__/0001_initial.cpython-310.pyc diff --git a/server/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc b/server/proj/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc similarity index 100% rename from server/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc rename to server/proj/news/migrations/__pycache__/0002_alter_news_author_alter_news_date.cpython-310.pyc diff --git a/server/news/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/news/migrations/__pycache__/__init__.cpython-310.pyc rename to server/proj/news/migrations/__pycache__/__init__.cpython-310.pyc diff --git a/server/news/models.py b/server/proj/news/models.py similarity index 100% rename from server/news/models.py rename to server/proj/news/models.py diff --git a/server/news/serializers.py b/server/proj/news/serializers.py similarity index 100% rename from server/news/serializers.py rename to server/proj/news/serializers.py diff --git a/server/news/tests.py b/server/proj/news/tests.py similarity index 100% rename from server/news/tests.py rename to server/proj/news/tests.py diff --git a/server/news/views.py b/server/proj/news/views.py similarity index 100% rename from server/news/views.py rename to server/proj/news/views.py diff --git a/server/rubricks/__init__.py b/server/proj/rubricks/__init__.py similarity index 100% rename from server/rubricks/__init__.py rename to server/proj/rubricks/__init__.py diff --git a/server/rubricks/__pycache__/__init__.cpython-310.pyc b/server/proj/rubricks/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/rubricks/__pycache__/__init__.cpython-310.pyc rename to server/proj/rubricks/__pycache__/__init__.cpython-310.pyc diff --git a/server/rubricks/__pycache__/admin.cpython-310.pyc b/server/proj/rubricks/__pycache__/admin.cpython-310.pyc similarity index 100% rename from server/rubricks/__pycache__/admin.cpython-310.pyc rename to server/proj/rubricks/__pycache__/admin.cpython-310.pyc diff --git a/server/rubricks/__pycache__/apps.cpython-310.pyc b/server/proj/rubricks/__pycache__/apps.cpython-310.pyc similarity index 100% rename from server/rubricks/__pycache__/apps.cpython-310.pyc rename to server/proj/rubricks/__pycache__/apps.cpython-310.pyc diff --git a/server/rubricks/__pycache__/models.cpython-310.pyc b/server/proj/rubricks/__pycache__/models.cpython-310.pyc similarity index 100% rename from server/rubricks/__pycache__/models.cpython-310.pyc rename to server/proj/rubricks/__pycache__/models.cpython-310.pyc diff --git a/server/rubricks/admin.py b/server/proj/rubricks/admin.py similarity index 100% rename from server/rubricks/admin.py rename to server/proj/rubricks/admin.py diff --git a/server/rubricks/apps.py b/server/proj/rubricks/apps.py similarity index 100% rename from server/rubricks/apps.py rename to server/proj/rubricks/apps.py diff --git a/server/rubricks/migrations/0001_initial.py b/server/proj/rubricks/migrations/0001_initial.py similarity index 100% rename from server/rubricks/migrations/0001_initial.py rename to server/proj/rubricks/migrations/0001_initial.py diff --git a/server/rubricks/migrations/0002_alter_rubric_time.py b/server/proj/rubricks/migrations/0002_alter_rubric_time.py similarity index 100% rename from server/rubricks/migrations/0002_alter_rubric_time.py rename to server/proj/rubricks/migrations/0002_alter_rubric_time.py diff --git a/server/rubricks/migrations/0003_remove_rubric_time.py b/server/proj/rubricks/migrations/0003_remove_rubric_time.py similarity index 100% rename from server/rubricks/migrations/0003_remove_rubric_time.py rename to server/proj/rubricks/migrations/0003_remove_rubric_time.py diff --git a/server/rubricks/migrations/__init__.py b/server/proj/rubricks/migrations/__init__.py similarity index 100% rename from server/rubricks/migrations/__init__.py rename to server/proj/rubricks/migrations/__init__.py diff --git a/server/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc similarity index 100% rename from server/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc rename to server/proj/rubricks/migrations/__pycache__/0001_initial.cpython-310.pyc diff --git a/server/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc similarity index 100% rename from server/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc rename to server/proj/rubricks/migrations/__pycache__/0002_alter_rubric_time.cpython-310.pyc diff --git a/server/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc similarity index 100% rename from server/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc rename to server/proj/rubricks/migrations/__pycache__/0003_remove_rubric_time.cpython-310.pyc diff --git a/server/rubricks/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/rubricks/migrations/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/rubricks/migrations/__pycache__/__init__.cpython-310.pyc rename to server/proj/rubricks/migrations/__pycache__/__init__.cpython-310.pyc diff --git a/server/rubricks/models.py b/server/proj/rubricks/models.py similarity index 100% rename from server/rubricks/models.py rename to server/proj/rubricks/models.py diff --git a/server/rubricks/serializers.py b/server/proj/rubricks/serializers.py similarity index 100% rename from server/rubricks/serializers.py rename to server/proj/rubricks/serializers.py diff --git a/server/rubricks/tests.py b/server/proj/rubricks/tests.py similarity index 100% rename from server/rubricks/tests.py rename to server/proj/rubricks/tests.py diff --git a/server/rubricks/views.py b/server/proj/rubricks/views.py similarity index 100% rename from server/rubricks/views.py rename to server/proj/rubricks/views.py diff --git a/server/scheduler/__init__.py b/server/proj/scheduler/__init__.py similarity index 100% rename from server/scheduler/__init__.py rename to server/proj/scheduler/__init__.py diff --git a/server/scheduler/admin.py b/server/proj/scheduler/admin.py similarity index 100% rename from server/scheduler/admin.py rename to server/proj/scheduler/admin.py diff --git a/server/scheduler/apps.py b/server/proj/scheduler/apps.py similarity index 100% rename from server/scheduler/apps.py rename to server/proj/scheduler/apps.py diff --git a/server/scheduler/migrations/__init__.py b/server/proj/scheduler/migrations/__init__.py similarity index 100% rename from server/scheduler/migrations/__init__.py rename to server/proj/scheduler/migrations/__init__.py diff --git a/server/scheduler/models.py b/server/proj/scheduler/models.py similarity index 100% rename from server/scheduler/models.py rename to server/proj/scheduler/models.py diff --git a/server/scheduler/tests.py b/server/proj/scheduler/tests.py similarity index 100% rename from server/scheduler/tests.py rename to server/proj/scheduler/tests.py diff --git a/server/scheduler/views.py b/server/proj/scheduler/views.py similarity index 100% rename from server/scheduler/views.py rename to server/proj/scheduler/views.py diff --git a/server/static/admin/css/autocomplete.css b/server/proj/static/admin/css/autocomplete.css similarity index 100% rename from server/static/admin/css/autocomplete.css rename to server/proj/static/admin/css/autocomplete.css diff --git a/server/static/admin/css/base.css b/server/proj/static/admin/css/base.css similarity index 100% rename from server/static/admin/css/base.css rename to server/proj/static/admin/css/base.css diff --git a/server/static/admin/css/changelists.css b/server/proj/static/admin/css/changelists.css similarity index 100% rename from server/static/admin/css/changelists.css rename to server/proj/static/admin/css/changelists.css diff --git a/server/static/admin/css/dark_mode.css b/server/proj/static/admin/css/dark_mode.css similarity index 100% rename from server/static/admin/css/dark_mode.css rename to server/proj/static/admin/css/dark_mode.css diff --git a/server/static/admin/css/dashboard.css b/server/proj/static/admin/css/dashboard.css similarity index 100% rename from server/static/admin/css/dashboard.css rename to server/proj/static/admin/css/dashboard.css diff --git a/server/static/admin/css/forms.css b/server/proj/static/admin/css/forms.css similarity index 100% rename from server/static/admin/css/forms.css rename to server/proj/static/admin/css/forms.css diff --git a/server/static/admin/css/login.css b/server/proj/static/admin/css/login.css similarity index 100% rename from server/static/admin/css/login.css rename to server/proj/static/admin/css/login.css diff --git a/server/static/admin/css/nav_sidebar.css b/server/proj/static/admin/css/nav_sidebar.css similarity index 100% rename from server/static/admin/css/nav_sidebar.css rename to server/proj/static/admin/css/nav_sidebar.css diff --git a/server/static/admin/css/responsive.css b/server/proj/static/admin/css/responsive.css similarity index 100% rename from server/static/admin/css/responsive.css rename to server/proj/static/admin/css/responsive.css diff --git a/server/static/admin/css/responsive_rtl.css b/server/proj/static/admin/css/responsive_rtl.css similarity index 100% rename from server/static/admin/css/responsive_rtl.css rename to server/proj/static/admin/css/responsive_rtl.css diff --git a/server/static/admin/css/rtl.css b/server/proj/static/admin/css/rtl.css similarity index 100% rename from server/static/admin/css/rtl.css rename to server/proj/static/admin/css/rtl.css diff --git a/server/static/admin/css/vendor/select2/LICENSE-SELECT2.md b/server/proj/static/admin/css/vendor/select2/LICENSE-SELECT2.md similarity index 100% rename from server/static/admin/css/vendor/select2/LICENSE-SELECT2.md rename to server/proj/static/admin/css/vendor/select2/LICENSE-SELECT2.md diff --git a/server/static/admin/css/vendor/select2/select2.css b/server/proj/static/admin/css/vendor/select2/select2.css similarity index 100% rename from server/static/admin/css/vendor/select2/select2.css rename to server/proj/static/admin/css/vendor/select2/select2.css diff --git a/server/static/admin/css/vendor/select2/select2.min.css b/server/proj/static/admin/css/vendor/select2/select2.min.css similarity index 100% rename from server/static/admin/css/vendor/select2/select2.min.css rename to server/proj/static/admin/css/vendor/select2/select2.min.css diff --git a/server/static/admin/css/widgets.css b/server/proj/static/admin/css/widgets.css similarity index 100% rename from server/static/admin/css/widgets.css rename to server/proj/static/admin/css/widgets.css diff --git a/server/static/admin/img/LICENSE b/server/proj/static/admin/img/LICENSE similarity index 100% rename from server/static/admin/img/LICENSE rename to server/proj/static/admin/img/LICENSE diff --git a/server/static/admin/img/README.txt b/server/proj/static/admin/img/README.txt similarity index 100% rename from server/static/admin/img/README.txt rename to server/proj/static/admin/img/README.txt diff --git a/server/static/admin/img/calendar-icons.svg b/server/proj/static/admin/img/calendar-icons.svg similarity index 100% rename from server/static/admin/img/calendar-icons.svg rename to server/proj/static/admin/img/calendar-icons.svg diff --git a/server/static/admin/img/gis/move_vertex_off.svg b/server/proj/static/admin/img/gis/move_vertex_off.svg similarity index 100% rename from server/static/admin/img/gis/move_vertex_off.svg rename to server/proj/static/admin/img/gis/move_vertex_off.svg diff --git a/server/static/admin/img/gis/move_vertex_on.svg b/server/proj/static/admin/img/gis/move_vertex_on.svg similarity index 100% rename from server/static/admin/img/gis/move_vertex_on.svg rename to server/proj/static/admin/img/gis/move_vertex_on.svg diff --git a/server/static/admin/img/icon-addlink.svg b/server/proj/static/admin/img/icon-addlink.svg similarity index 100% rename from server/static/admin/img/icon-addlink.svg rename to server/proj/static/admin/img/icon-addlink.svg diff --git a/server/static/admin/img/icon-alert.svg b/server/proj/static/admin/img/icon-alert.svg similarity index 100% rename from server/static/admin/img/icon-alert.svg rename to server/proj/static/admin/img/icon-alert.svg diff --git a/server/static/admin/img/icon-calendar.svg b/server/proj/static/admin/img/icon-calendar.svg similarity index 100% rename from server/static/admin/img/icon-calendar.svg rename to server/proj/static/admin/img/icon-calendar.svg diff --git a/server/static/admin/img/icon-changelink.svg b/server/proj/static/admin/img/icon-changelink.svg similarity index 100% rename from server/static/admin/img/icon-changelink.svg rename to server/proj/static/admin/img/icon-changelink.svg diff --git a/server/static/admin/img/icon-clock.svg b/server/proj/static/admin/img/icon-clock.svg similarity index 100% rename from server/static/admin/img/icon-clock.svg rename to server/proj/static/admin/img/icon-clock.svg diff --git a/server/static/admin/img/icon-deletelink.svg b/server/proj/static/admin/img/icon-deletelink.svg similarity index 100% rename from server/static/admin/img/icon-deletelink.svg rename to server/proj/static/admin/img/icon-deletelink.svg diff --git a/server/static/admin/img/icon-hidelink.svg b/server/proj/static/admin/img/icon-hidelink.svg similarity index 100% rename from server/static/admin/img/icon-hidelink.svg rename to server/proj/static/admin/img/icon-hidelink.svg diff --git a/server/static/admin/img/icon-no.svg b/server/proj/static/admin/img/icon-no.svg similarity index 100% rename from server/static/admin/img/icon-no.svg rename to server/proj/static/admin/img/icon-no.svg diff --git a/server/static/admin/img/icon-unknown-alt.svg b/server/proj/static/admin/img/icon-unknown-alt.svg similarity index 100% rename from server/static/admin/img/icon-unknown-alt.svg rename to server/proj/static/admin/img/icon-unknown-alt.svg diff --git a/server/static/admin/img/icon-unknown.svg b/server/proj/static/admin/img/icon-unknown.svg similarity index 100% rename from server/static/admin/img/icon-unknown.svg rename to server/proj/static/admin/img/icon-unknown.svg diff --git a/server/static/admin/img/icon-viewlink.svg b/server/proj/static/admin/img/icon-viewlink.svg similarity index 100% rename from server/static/admin/img/icon-viewlink.svg rename to server/proj/static/admin/img/icon-viewlink.svg diff --git a/server/static/admin/img/icon-yes.svg b/server/proj/static/admin/img/icon-yes.svg similarity index 100% rename from server/static/admin/img/icon-yes.svg rename to server/proj/static/admin/img/icon-yes.svg diff --git a/server/static/admin/img/inline-delete.svg b/server/proj/static/admin/img/inline-delete.svg similarity index 100% rename from server/static/admin/img/inline-delete.svg rename to server/proj/static/admin/img/inline-delete.svg diff --git a/server/static/admin/img/search.svg b/server/proj/static/admin/img/search.svg similarity index 100% rename from server/static/admin/img/search.svg rename to server/proj/static/admin/img/search.svg diff --git a/server/static/admin/img/selector-icons.svg b/server/proj/static/admin/img/selector-icons.svg similarity index 100% rename from server/static/admin/img/selector-icons.svg rename to server/proj/static/admin/img/selector-icons.svg diff --git a/server/static/admin/img/sorting-icons.svg b/server/proj/static/admin/img/sorting-icons.svg similarity index 100% rename from server/static/admin/img/sorting-icons.svg rename to server/proj/static/admin/img/sorting-icons.svg diff --git a/server/static/admin/img/tooltag-add.svg b/server/proj/static/admin/img/tooltag-add.svg similarity index 100% rename from server/static/admin/img/tooltag-add.svg rename to server/proj/static/admin/img/tooltag-add.svg diff --git a/server/static/admin/img/tooltag-arrowright.svg b/server/proj/static/admin/img/tooltag-arrowright.svg similarity index 100% rename from server/static/admin/img/tooltag-arrowright.svg rename to server/proj/static/admin/img/tooltag-arrowright.svg diff --git a/server/static/admin/js/SelectBox.js b/server/proj/static/admin/js/SelectBox.js similarity index 100% rename from server/static/admin/js/SelectBox.js rename to server/proj/static/admin/js/SelectBox.js diff --git a/server/static/admin/js/SelectFilter2.js b/server/proj/static/admin/js/SelectFilter2.js similarity index 100% rename from server/static/admin/js/SelectFilter2.js rename to server/proj/static/admin/js/SelectFilter2.js diff --git a/server/static/admin/js/actions.js b/server/proj/static/admin/js/actions.js similarity index 100% rename from server/static/admin/js/actions.js rename to server/proj/static/admin/js/actions.js diff --git a/server/static/admin/js/admin/DateTimeShortcuts.js b/server/proj/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from server/static/admin/js/admin/DateTimeShortcuts.js rename to server/proj/static/admin/js/admin/DateTimeShortcuts.js diff --git a/server/static/admin/js/admin/RelatedObjectLookups.js b/server/proj/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from server/static/admin/js/admin/RelatedObjectLookups.js rename to server/proj/static/admin/js/admin/RelatedObjectLookups.js diff --git a/server/static/admin/js/autocomplete.js b/server/proj/static/admin/js/autocomplete.js similarity index 100% rename from server/static/admin/js/autocomplete.js rename to server/proj/static/admin/js/autocomplete.js diff --git a/server/static/admin/js/calendar.js b/server/proj/static/admin/js/calendar.js similarity index 100% rename from server/static/admin/js/calendar.js rename to server/proj/static/admin/js/calendar.js diff --git a/server/static/admin/js/cancel.js b/server/proj/static/admin/js/cancel.js similarity index 100% rename from server/static/admin/js/cancel.js rename to server/proj/static/admin/js/cancel.js diff --git a/server/static/admin/js/change_form.js b/server/proj/static/admin/js/change_form.js similarity index 100% rename from server/static/admin/js/change_form.js rename to server/proj/static/admin/js/change_form.js diff --git a/server/static/admin/js/collapse.js b/server/proj/static/admin/js/collapse.js similarity index 100% rename from server/static/admin/js/collapse.js rename to server/proj/static/admin/js/collapse.js diff --git a/server/static/admin/js/core.js b/server/proj/static/admin/js/core.js similarity index 100% rename from server/static/admin/js/core.js rename to server/proj/static/admin/js/core.js diff --git a/server/static/admin/js/filters.js b/server/proj/static/admin/js/filters.js similarity index 100% rename from server/static/admin/js/filters.js rename to server/proj/static/admin/js/filters.js diff --git a/server/static/admin/js/inlines.js b/server/proj/static/admin/js/inlines.js similarity index 100% rename from server/static/admin/js/inlines.js rename to server/proj/static/admin/js/inlines.js diff --git a/server/static/admin/js/jquery.init.js b/server/proj/static/admin/js/jquery.init.js similarity index 100% rename from server/static/admin/js/jquery.init.js rename to server/proj/static/admin/js/jquery.init.js diff --git a/server/static/admin/js/nav_sidebar.js b/server/proj/static/admin/js/nav_sidebar.js similarity index 100% rename from server/static/admin/js/nav_sidebar.js rename to server/proj/static/admin/js/nav_sidebar.js diff --git a/server/static/admin/js/popup_response.js b/server/proj/static/admin/js/popup_response.js similarity index 100% rename from server/static/admin/js/popup_response.js rename to server/proj/static/admin/js/popup_response.js diff --git a/server/static/admin/js/prepopulate.js b/server/proj/static/admin/js/prepopulate.js similarity index 100% rename from server/static/admin/js/prepopulate.js rename to server/proj/static/admin/js/prepopulate.js diff --git a/server/static/admin/js/prepopulate_init.js b/server/proj/static/admin/js/prepopulate_init.js similarity index 100% rename from server/static/admin/js/prepopulate_init.js rename to server/proj/static/admin/js/prepopulate_init.js diff --git a/server/static/admin/js/theme.js b/server/proj/static/admin/js/theme.js similarity index 100% rename from server/static/admin/js/theme.js rename to server/proj/static/admin/js/theme.js diff --git a/server/static/admin/js/urlify.js b/server/proj/static/admin/js/urlify.js similarity index 100% rename from server/static/admin/js/urlify.js rename to server/proj/static/admin/js/urlify.js diff --git a/server/static/admin/js/vendor/jquery/LICENSE.txt b/server/proj/static/admin/js/vendor/jquery/LICENSE.txt similarity index 100% rename from server/static/admin/js/vendor/jquery/LICENSE.txt rename to server/proj/static/admin/js/vendor/jquery/LICENSE.txt diff --git a/server/static/admin/js/vendor/jquery/jquery.js b/server/proj/static/admin/js/vendor/jquery/jquery.js similarity index 100% rename from server/static/admin/js/vendor/jquery/jquery.js rename to server/proj/static/admin/js/vendor/jquery/jquery.js diff --git a/server/static/admin/js/vendor/jquery/jquery.min.js b/server/proj/static/admin/js/vendor/jquery/jquery.min.js similarity index 100% rename from server/static/admin/js/vendor/jquery/jquery.min.js rename to server/proj/static/admin/js/vendor/jquery/jquery.min.js diff --git a/server/static/admin/js/vendor/select2/LICENSE.md b/server/proj/static/admin/js/vendor/select2/LICENSE.md similarity index 100% rename from server/static/admin/js/vendor/select2/LICENSE.md rename to server/proj/static/admin/js/vendor/select2/LICENSE.md diff --git a/server/static/admin/js/vendor/select2/i18n/af.js b/server/proj/static/admin/js/vendor/select2/i18n/af.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/af.js rename to server/proj/static/admin/js/vendor/select2/i18n/af.js diff --git a/server/static/admin/js/vendor/select2/i18n/ar.js b/server/proj/static/admin/js/vendor/select2/i18n/ar.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ar.js rename to server/proj/static/admin/js/vendor/select2/i18n/ar.js diff --git a/server/static/admin/js/vendor/select2/i18n/az.js b/server/proj/static/admin/js/vendor/select2/i18n/az.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/az.js rename to server/proj/static/admin/js/vendor/select2/i18n/az.js diff --git a/server/static/admin/js/vendor/select2/i18n/bg.js b/server/proj/static/admin/js/vendor/select2/i18n/bg.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/bg.js rename to server/proj/static/admin/js/vendor/select2/i18n/bg.js diff --git a/server/static/admin/js/vendor/select2/i18n/bn.js b/server/proj/static/admin/js/vendor/select2/i18n/bn.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/bn.js rename to server/proj/static/admin/js/vendor/select2/i18n/bn.js diff --git a/server/static/admin/js/vendor/select2/i18n/bs.js b/server/proj/static/admin/js/vendor/select2/i18n/bs.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/bs.js rename to server/proj/static/admin/js/vendor/select2/i18n/bs.js diff --git a/server/static/admin/js/vendor/select2/i18n/ca.js b/server/proj/static/admin/js/vendor/select2/i18n/ca.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ca.js rename to server/proj/static/admin/js/vendor/select2/i18n/ca.js diff --git a/server/static/admin/js/vendor/select2/i18n/cs.js b/server/proj/static/admin/js/vendor/select2/i18n/cs.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/cs.js rename to server/proj/static/admin/js/vendor/select2/i18n/cs.js diff --git a/server/static/admin/js/vendor/select2/i18n/da.js b/server/proj/static/admin/js/vendor/select2/i18n/da.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/da.js rename to server/proj/static/admin/js/vendor/select2/i18n/da.js diff --git a/server/static/admin/js/vendor/select2/i18n/de.js b/server/proj/static/admin/js/vendor/select2/i18n/de.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/de.js rename to server/proj/static/admin/js/vendor/select2/i18n/de.js diff --git a/server/static/admin/js/vendor/select2/i18n/dsb.js b/server/proj/static/admin/js/vendor/select2/i18n/dsb.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/dsb.js rename to server/proj/static/admin/js/vendor/select2/i18n/dsb.js diff --git a/server/static/admin/js/vendor/select2/i18n/el.js b/server/proj/static/admin/js/vendor/select2/i18n/el.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/el.js rename to server/proj/static/admin/js/vendor/select2/i18n/el.js diff --git a/server/static/admin/js/vendor/select2/i18n/en.js b/server/proj/static/admin/js/vendor/select2/i18n/en.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/en.js rename to server/proj/static/admin/js/vendor/select2/i18n/en.js diff --git a/server/static/admin/js/vendor/select2/i18n/es.js b/server/proj/static/admin/js/vendor/select2/i18n/es.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/es.js rename to server/proj/static/admin/js/vendor/select2/i18n/es.js diff --git a/server/static/admin/js/vendor/select2/i18n/et.js b/server/proj/static/admin/js/vendor/select2/i18n/et.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/et.js rename to server/proj/static/admin/js/vendor/select2/i18n/et.js diff --git a/server/static/admin/js/vendor/select2/i18n/eu.js b/server/proj/static/admin/js/vendor/select2/i18n/eu.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/eu.js rename to server/proj/static/admin/js/vendor/select2/i18n/eu.js diff --git a/server/static/admin/js/vendor/select2/i18n/fa.js b/server/proj/static/admin/js/vendor/select2/i18n/fa.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/fa.js rename to server/proj/static/admin/js/vendor/select2/i18n/fa.js diff --git a/server/static/admin/js/vendor/select2/i18n/fi.js b/server/proj/static/admin/js/vendor/select2/i18n/fi.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/fi.js rename to server/proj/static/admin/js/vendor/select2/i18n/fi.js diff --git a/server/static/admin/js/vendor/select2/i18n/fr.js b/server/proj/static/admin/js/vendor/select2/i18n/fr.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/fr.js rename to server/proj/static/admin/js/vendor/select2/i18n/fr.js diff --git a/server/static/admin/js/vendor/select2/i18n/gl.js b/server/proj/static/admin/js/vendor/select2/i18n/gl.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/gl.js rename to server/proj/static/admin/js/vendor/select2/i18n/gl.js diff --git a/server/static/admin/js/vendor/select2/i18n/he.js b/server/proj/static/admin/js/vendor/select2/i18n/he.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/he.js rename to server/proj/static/admin/js/vendor/select2/i18n/he.js diff --git a/server/static/admin/js/vendor/select2/i18n/hi.js b/server/proj/static/admin/js/vendor/select2/i18n/hi.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/hi.js rename to server/proj/static/admin/js/vendor/select2/i18n/hi.js diff --git a/server/static/admin/js/vendor/select2/i18n/hr.js b/server/proj/static/admin/js/vendor/select2/i18n/hr.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/hr.js rename to server/proj/static/admin/js/vendor/select2/i18n/hr.js diff --git a/server/static/admin/js/vendor/select2/i18n/hsb.js b/server/proj/static/admin/js/vendor/select2/i18n/hsb.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/hsb.js rename to server/proj/static/admin/js/vendor/select2/i18n/hsb.js diff --git a/server/static/admin/js/vendor/select2/i18n/hu.js b/server/proj/static/admin/js/vendor/select2/i18n/hu.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/hu.js rename to server/proj/static/admin/js/vendor/select2/i18n/hu.js diff --git a/server/static/admin/js/vendor/select2/i18n/hy.js b/server/proj/static/admin/js/vendor/select2/i18n/hy.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/hy.js rename to server/proj/static/admin/js/vendor/select2/i18n/hy.js diff --git a/server/static/admin/js/vendor/select2/i18n/id.js b/server/proj/static/admin/js/vendor/select2/i18n/id.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/id.js rename to server/proj/static/admin/js/vendor/select2/i18n/id.js diff --git a/server/static/admin/js/vendor/select2/i18n/is.js b/server/proj/static/admin/js/vendor/select2/i18n/is.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/is.js rename to server/proj/static/admin/js/vendor/select2/i18n/is.js diff --git a/server/static/admin/js/vendor/select2/i18n/it.js b/server/proj/static/admin/js/vendor/select2/i18n/it.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/it.js rename to server/proj/static/admin/js/vendor/select2/i18n/it.js diff --git a/server/static/admin/js/vendor/select2/i18n/ja.js b/server/proj/static/admin/js/vendor/select2/i18n/ja.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ja.js rename to server/proj/static/admin/js/vendor/select2/i18n/ja.js diff --git a/server/static/admin/js/vendor/select2/i18n/ka.js b/server/proj/static/admin/js/vendor/select2/i18n/ka.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ka.js rename to server/proj/static/admin/js/vendor/select2/i18n/ka.js diff --git a/server/static/admin/js/vendor/select2/i18n/km.js b/server/proj/static/admin/js/vendor/select2/i18n/km.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/km.js rename to server/proj/static/admin/js/vendor/select2/i18n/km.js diff --git a/server/static/admin/js/vendor/select2/i18n/ko.js b/server/proj/static/admin/js/vendor/select2/i18n/ko.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ko.js rename to server/proj/static/admin/js/vendor/select2/i18n/ko.js diff --git a/server/static/admin/js/vendor/select2/i18n/lt.js b/server/proj/static/admin/js/vendor/select2/i18n/lt.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/lt.js rename to server/proj/static/admin/js/vendor/select2/i18n/lt.js diff --git a/server/static/admin/js/vendor/select2/i18n/lv.js b/server/proj/static/admin/js/vendor/select2/i18n/lv.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/lv.js rename to server/proj/static/admin/js/vendor/select2/i18n/lv.js diff --git a/server/static/admin/js/vendor/select2/i18n/mk.js b/server/proj/static/admin/js/vendor/select2/i18n/mk.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/mk.js rename to server/proj/static/admin/js/vendor/select2/i18n/mk.js diff --git a/server/static/admin/js/vendor/select2/i18n/ms.js b/server/proj/static/admin/js/vendor/select2/i18n/ms.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ms.js rename to server/proj/static/admin/js/vendor/select2/i18n/ms.js diff --git a/server/static/admin/js/vendor/select2/i18n/nb.js b/server/proj/static/admin/js/vendor/select2/i18n/nb.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/nb.js rename to server/proj/static/admin/js/vendor/select2/i18n/nb.js diff --git a/server/static/admin/js/vendor/select2/i18n/ne.js b/server/proj/static/admin/js/vendor/select2/i18n/ne.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ne.js rename to server/proj/static/admin/js/vendor/select2/i18n/ne.js diff --git a/server/static/admin/js/vendor/select2/i18n/nl.js b/server/proj/static/admin/js/vendor/select2/i18n/nl.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/nl.js rename to server/proj/static/admin/js/vendor/select2/i18n/nl.js diff --git a/server/static/admin/js/vendor/select2/i18n/pl.js b/server/proj/static/admin/js/vendor/select2/i18n/pl.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/pl.js rename to server/proj/static/admin/js/vendor/select2/i18n/pl.js diff --git a/server/static/admin/js/vendor/select2/i18n/ps.js b/server/proj/static/admin/js/vendor/select2/i18n/ps.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ps.js rename to server/proj/static/admin/js/vendor/select2/i18n/ps.js diff --git a/server/static/admin/js/vendor/select2/i18n/pt-BR.js b/server/proj/static/admin/js/vendor/select2/i18n/pt-BR.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/pt-BR.js rename to server/proj/static/admin/js/vendor/select2/i18n/pt-BR.js diff --git a/server/static/admin/js/vendor/select2/i18n/pt.js b/server/proj/static/admin/js/vendor/select2/i18n/pt.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/pt.js rename to server/proj/static/admin/js/vendor/select2/i18n/pt.js diff --git a/server/static/admin/js/vendor/select2/i18n/ro.js b/server/proj/static/admin/js/vendor/select2/i18n/ro.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ro.js rename to server/proj/static/admin/js/vendor/select2/i18n/ro.js diff --git a/server/static/admin/js/vendor/select2/i18n/ru.js b/server/proj/static/admin/js/vendor/select2/i18n/ru.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/ru.js rename to server/proj/static/admin/js/vendor/select2/i18n/ru.js diff --git a/server/static/admin/js/vendor/select2/i18n/sk.js b/server/proj/static/admin/js/vendor/select2/i18n/sk.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/sk.js rename to server/proj/static/admin/js/vendor/select2/i18n/sk.js diff --git a/server/static/admin/js/vendor/select2/i18n/sl.js b/server/proj/static/admin/js/vendor/select2/i18n/sl.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/sl.js rename to server/proj/static/admin/js/vendor/select2/i18n/sl.js diff --git a/server/static/admin/js/vendor/select2/i18n/sq.js b/server/proj/static/admin/js/vendor/select2/i18n/sq.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/sq.js rename to server/proj/static/admin/js/vendor/select2/i18n/sq.js diff --git a/server/static/admin/js/vendor/select2/i18n/sr-Cyrl.js b/server/proj/static/admin/js/vendor/select2/i18n/sr-Cyrl.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/sr-Cyrl.js rename to server/proj/static/admin/js/vendor/select2/i18n/sr-Cyrl.js diff --git a/server/static/admin/js/vendor/select2/i18n/sr.js b/server/proj/static/admin/js/vendor/select2/i18n/sr.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/sr.js rename to server/proj/static/admin/js/vendor/select2/i18n/sr.js diff --git a/server/static/admin/js/vendor/select2/i18n/sv.js b/server/proj/static/admin/js/vendor/select2/i18n/sv.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/sv.js rename to server/proj/static/admin/js/vendor/select2/i18n/sv.js diff --git a/server/static/admin/js/vendor/select2/i18n/th.js b/server/proj/static/admin/js/vendor/select2/i18n/th.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/th.js rename to server/proj/static/admin/js/vendor/select2/i18n/th.js diff --git a/server/static/admin/js/vendor/select2/i18n/tk.js b/server/proj/static/admin/js/vendor/select2/i18n/tk.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/tk.js rename to server/proj/static/admin/js/vendor/select2/i18n/tk.js diff --git a/server/static/admin/js/vendor/select2/i18n/tr.js b/server/proj/static/admin/js/vendor/select2/i18n/tr.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/tr.js rename to server/proj/static/admin/js/vendor/select2/i18n/tr.js diff --git a/server/static/admin/js/vendor/select2/i18n/uk.js b/server/proj/static/admin/js/vendor/select2/i18n/uk.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/uk.js rename to server/proj/static/admin/js/vendor/select2/i18n/uk.js diff --git a/server/static/admin/js/vendor/select2/i18n/vi.js b/server/proj/static/admin/js/vendor/select2/i18n/vi.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/vi.js rename to server/proj/static/admin/js/vendor/select2/i18n/vi.js diff --git a/server/static/admin/js/vendor/select2/i18n/zh-CN.js b/server/proj/static/admin/js/vendor/select2/i18n/zh-CN.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/zh-CN.js rename to server/proj/static/admin/js/vendor/select2/i18n/zh-CN.js diff --git a/server/static/admin/js/vendor/select2/i18n/zh-TW.js b/server/proj/static/admin/js/vendor/select2/i18n/zh-TW.js similarity index 100% rename from server/static/admin/js/vendor/select2/i18n/zh-TW.js rename to server/proj/static/admin/js/vendor/select2/i18n/zh-TW.js diff --git a/server/static/admin/js/vendor/select2/select2.full.js b/server/proj/static/admin/js/vendor/select2/select2.full.js similarity index 100% rename from server/static/admin/js/vendor/select2/select2.full.js rename to server/proj/static/admin/js/vendor/select2/select2.full.js diff --git a/server/static/admin/js/vendor/select2/select2.full.min.js b/server/proj/static/admin/js/vendor/select2/select2.full.min.js similarity index 100% rename from server/static/admin/js/vendor/select2/select2.full.min.js rename to server/proj/static/admin/js/vendor/select2/select2.full.min.js diff --git a/server/static/admin/js/vendor/xregexp/LICENSE.txt b/server/proj/static/admin/js/vendor/xregexp/LICENSE.txt similarity index 100% rename from server/static/admin/js/vendor/xregexp/LICENSE.txt rename to server/proj/static/admin/js/vendor/xregexp/LICENSE.txt diff --git a/server/static/admin/js/vendor/xregexp/xregexp.js b/server/proj/static/admin/js/vendor/xregexp/xregexp.js similarity index 100% rename from server/static/admin/js/vendor/xregexp/xregexp.js rename to server/proj/static/admin/js/vendor/xregexp/xregexp.js diff --git a/server/static/admin/js/vendor/xregexp/xregexp.min.js b/server/proj/static/admin/js/vendor/xregexp/xregexp.min.js similarity index 100% rename from server/static/admin/js/vendor/xregexp/xregexp.min.js rename to server/proj/static/admin/js/vendor/xregexp/xregexp.min.js diff --git a/server/static/rest_framework/css/bootstrap-theme.min.css b/server/proj/static/rest_framework/css/bootstrap-theme.min.css similarity index 100% rename from server/static/rest_framework/css/bootstrap-theme.min.css rename to server/proj/static/rest_framework/css/bootstrap-theme.min.css diff --git a/server/static/rest_framework/css/bootstrap-theme.min.css.map b/server/proj/static/rest_framework/css/bootstrap-theme.min.css.map similarity index 100% rename from server/static/rest_framework/css/bootstrap-theme.min.css.map rename to server/proj/static/rest_framework/css/bootstrap-theme.min.css.map diff --git a/server/static/rest_framework/css/bootstrap-tweaks.css b/server/proj/static/rest_framework/css/bootstrap-tweaks.css similarity index 100% rename from server/static/rest_framework/css/bootstrap-tweaks.css rename to server/proj/static/rest_framework/css/bootstrap-tweaks.css diff --git a/server/static/rest_framework/css/bootstrap.min.css b/server/proj/static/rest_framework/css/bootstrap.min.css similarity index 100% rename from server/static/rest_framework/css/bootstrap.min.css rename to server/proj/static/rest_framework/css/bootstrap.min.css diff --git a/server/static/rest_framework/css/bootstrap.min.css.map b/server/proj/static/rest_framework/css/bootstrap.min.css.map similarity index 100% rename from server/static/rest_framework/css/bootstrap.min.css.map rename to server/proj/static/rest_framework/css/bootstrap.min.css.map diff --git a/server/static/rest_framework/css/default.css b/server/proj/static/rest_framework/css/default.css similarity index 100% rename from server/static/rest_framework/css/default.css rename to server/proj/static/rest_framework/css/default.css diff --git a/server/static/rest_framework/css/font-awesome-4.0.3.css b/server/proj/static/rest_framework/css/font-awesome-4.0.3.css similarity index 100% rename from server/static/rest_framework/css/font-awesome-4.0.3.css rename to server/proj/static/rest_framework/css/font-awesome-4.0.3.css diff --git a/server/static/rest_framework/css/prettify.css b/server/proj/static/rest_framework/css/prettify.css similarity index 100% rename from server/static/rest_framework/css/prettify.css rename to server/proj/static/rest_framework/css/prettify.css diff --git a/server/static/rest_framework/docs/css/base.css b/server/proj/static/rest_framework/docs/css/base.css similarity index 100% rename from server/static/rest_framework/docs/css/base.css rename to server/proj/static/rest_framework/docs/css/base.css diff --git a/server/static/rest_framework/docs/css/highlight.css b/server/proj/static/rest_framework/docs/css/highlight.css similarity index 100% rename from server/static/rest_framework/docs/css/highlight.css rename to server/proj/static/rest_framework/docs/css/highlight.css diff --git a/server/static/rest_framework/docs/css/jquery.json-view.min.css b/server/proj/static/rest_framework/docs/css/jquery.json-view.min.css similarity index 100% rename from server/static/rest_framework/docs/css/jquery.json-view.min.css rename to server/proj/static/rest_framework/docs/css/jquery.json-view.min.css diff --git a/server/static/rest_framework/docs/img/favicon.ico b/server/proj/static/rest_framework/docs/img/favicon.ico similarity index 100% rename from server/static/rest_framework/docs/img/favicon.ico rename to server/proj/static/rest_framework/docs/img/favicon.ico diff --git a/server/static/rest_framework/docs/img/grid.png b/server/proj/static/rest_framework/docs/img/grid.png similarity index 100% rename from server/static/rest_framework/docs/img/grid.png rename to server/proj/static/rest_framework/docs/img/grid.png diff --git a/server/static/rest_framework/docs/js/api.js b/server/proj/static/rest_framework/docs/js/api.js similarity index 100% rename from server/static/rest_framework/docs/js/api.js rename to server/proj/static/rest_framework/docs/js/api.js diff --git a/server/static/rest_framework/docs/js/highlight.pack.js b/server/proj/static/rest_framework/docs/js/highlight.pack.js similarity index 100% rename from server/static/rest_framework/docs/js/highlight.pack.js rename to server/proj/static/rest_framework/docs/js/highlight.pack.js diff --git a/server/static/rest_framework/docs/js/jquery.json-view.min.js b/server/proj/static/rest_framework/docs/js/jquery.json-view.min.js similarity index 100% rename from server/static/rest_framework/docs/js/jquery.json-view.min.js rename to server/proj/static/rest_framework/docs/js/jquery.json-view.min.js diff --git a/server/static/rest_framework/fonts/fontawesome-webfont.eot b/server/proj/static/rest_framework/fonts/fontawesome-webfont.eot similarity index 100% rename from server/static/rest_framework/fonts/fontawesome-webfont.eot rename to server/proj/static/rest_framework/fonts/fontawesome-webfont.eot diff --git a/server/static/rest_framework/fonts/fontawesome-webfont.svg b/server/proj/static/rest_framework/fonts/fontawesome-webfont.svg similarity index 100% rename from server/static/rest_framework/fonts/fontawesome-webfont.svg rename to server/proj/static/rest_framework/fonts/fontawesome-webfont.svg diff --git a/server/static/rest_framework/fonts/fontawesome-webfont.ttf b/server/proj/static/rest_framework/fonts/fontawesome-webfont.ttf similarity index 100% rename from server/static/rest_framework/fonts/fontawesome-webfont.ttf rename to server/proj/static/rest_framework/fonts/fontawesome-webfont.ttf diff --git a/server/static/rest_framework/fonts/fontawesome-webfont.woff b/server/proj/static/rest_framework/fonts/fontawesome-webfont.woff similarity index 100% rename from server/static/rest_framework/fonts/fontawesome-webfont.woff rename to server/proj/static/rest_framework/fonts/fontawesome-webfont.woff diff --git a/server/static/rest_framework/fonts/glyphicons-halflings-regular.eot b/server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from server/static/rest_framework/fonts/glyphicons-halflings-regular.eot rename to server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.eot diff --git a/server/static/rest_framework/fonts/glyphicons-halflings-regular.svg b/server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from server/static/rest_framework/fonts/glyphicons-halflings-regular.svg rename to server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.svg diff --git a/server/static/rest_framework/fonts/glyphicons-halflings-regular.ttf b/server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from server/static/rest_framework/fonts/glyphicons-halflings-regular.ttf rename to server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.ttf diff --git a/server/static/rest_framework/fonts/glyphicons-halflings-regular.woff b/server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from server/static/rest_framework/fonts/glyphicons-halflings-regular.woff rename to server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.woff diff --git a/server/static/rest_framework/fonts/glyphicons-halflings-regular.woff2 b/server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from server/static/rest_framework/fonts/glyphicons-halflings-regular.woff2 rename to server/proj/static/rest_framework/fonts/glyphicons-halflings-regular.woff2 diff --git a/server/static/rest_framework/img/glyphicons-halflings-white.png b/server/proj/static/rest_framework/img/glyphicons-halflings-white.png similarity index 100% rename from server/static/rest_framework/img/glyphicons-halflings-white.png rename to server/proj/static/rest_framework/img/glyphicons-halflings-white.png diff --git a/server/static/rest_framework/img/glyphicons-halflings.png b/server/proj/static/rest_framework/img/glyphicons-halflings.png similarity index 100% rename from server/static/rest_framework/img/glyphicons-halflings.png rename to server/proj/static/rest_framework/img/glyphicons-halflings.png diff --git a/server/static/rest_framework/img/grid.png b/server/proj/static/rest_framework/img/grid.png similarity index 100% rename from server/static/rest_framework/img/grid.png rename to server/proj/static/rest_framework/img/grid.png diff --git a/server/static/rest_framework/js/ajax-form.js b/server/proj/static/rest_framework/js/ajax-form.js similarity index 100% rename from server/static/rest_framework/js/ajax-form.js rename to server/proj/static/rest_framework/js/ajax-form.js diff --git a/server/static/rest_framework/js/bootstrap.min.js b/server/proj/static/rest_framework/js/bootstrap.min.js similarity index 100% rename from server/static/rest_framework/js/bootstrap.min.js rename to server/proj/static/rest_framework/js/bootstrap.min.js diff --git a/server/static/rest_framework/js/coreapi-0.1.1.js b/server/proj/static/rest_framework/js/coreapi-0.1.1.js similarity index 100% rename from server/static/rest_framework/js/coreapi-0.1.1.js rename to server/proj/static/rest_framework/js/coreapi-0.1.1.js diff --git a/server/static/rest_framework/js/csrf.js b/server/proj/static/rest_framework/js/csrf.js similarity index 100% rename from server/static/rest_framework/js/csrf.js rename to server/proj/static/rest_framework/js/csrf.js diff --git a/server/static/rest_framework/js/default.js b/server/proj/static/rest_framework/js/default.js similarity index 100% rename from server/static/rest_framework/js/default.js rename to server/proj/static/rest_framework/js/default.js diff --git a/server/static/rest_framework/js/jquery-3.7.1.min.js b/server/proj/static/rest_framework/js/jquery-3.7.1.min.js similarity index 100% rename from server/static/rest_framework/js/jquery-3.7.1.min.js rename to server/proj/static/rest_framework/js/jquery-3.7.1.min.js diff --git a/server/static/rest_framework/js/load-ajax-form.js b/server/proj/static/rest_framework/js/load-ajax-form.js similarity index 100% rename from server/static/rest_framework/js/load-ajax-form.js rename to server/proj/static/rest_framework/js/load-ajax-form.js diff --git a/server/static/rest_framework/js/prettify-min.js b/server/proj/static/rest_framework/js/prettify-min.js similarity index 100% rename from server/static/rest_framework/js/prettify-min.js rename to server/proj/static/rest_framework/js/prettify-min.js diff --git a/server/userProfile/__init__.py b/server/proj/userProfile/__init__.py similarity index 100% rename from server/userProfile/__init__.py rename to server/proj/userProfile/__init__.py diff --git a/server/userProfile/__pycache__/__init__.cpython-310.pyc b/server/proj/userProfile/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/userProfile/__pycache__/__init__.cpython-310.pyc rename to server/proj/userProfile/__pycache__/__init__.cpython-310.pyc diff --git a/server/userProfile/__pycache__/admin.cpython-310.pyc b/server/proj/userProfile/__pycache__/admin.cpython-310.pyc similarity index 100% rename from server/userProfile/__pycache__/admin.cpython-310.pyc rename to server/proj/userProfile/__pycache__/admin.cpython-310.pyc diff --git a/server/userProfile/__pycache__/apps.cpython-310.pyc b/server/proj/userProfile/__pycache__/apps.cpython-310.pyc similarity index 100% rename from server/userProfile/__pycache__/apps.cpython-310.pyc rename to server/proj/userProfile/__pycache__/apps.cpython-310.pyc diff --git a/server/userProfile/__pycache__/models.cpython-310.pyc b/server/proj/userProfile/__pycache__/models.cpython-310.pyc similarity index 100% rename from server/userProfile/__pycache__/models.cpython-310.pyc rename to server/proj/userProfile/__pycache__/models.cpython-310.pyc diff --git a/server/userProfile/__pycache__/serializers.cpython-310.pyc b/server/proj/userProfile/__pycache__/serializers.cpython-310.pyc similarity index 100% rename from server/userProfile/__pycache__/serializers.cpython-310.pyc rename to server/proj/userProfile/__pycache__/serializers.cpython-310.pyc diff --git a/server/userProfile/__pycache__/views.cpython-310.pyc b/server/proj/userProfile/__pycache__/views.cpython-310.pyc similarity index 100% rename from server/userProfile/__pycache__/views.cpython-310.pyc rename to server/proj/userProfile/__pycache__/views.cpython-310.pyc diff --git a/server/userProfile/admin.py b/server/proj/userProfile/admin.py similarity index 100% rename from server/userProfile/admin.py rename to server/proj/userProfile/admin.py diff --git a/server/userProfile/apps.py b/server/proj/userProfile/apps.py similarity index 100% rename from server/userProfile/apps.py rename to server/proj/userProfile/apps.py diff --git a/server/userProfile/migrations/0001_initial.py b/server/proj/userProfile/migrations/0001_initial.py similarity index 100% rename from server/userProfile/migrations/0001_initial.py rename to server/proj/userProfile/migrations/0001_initial.py diff --git a/server/userProfile/migrations/0002_alter_profile_likedsongs.py b/server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py similarity index 100% rename from server/userProfile/migrations/0002_alter_profile_likedsongs.py rename to server/proj/userProfile/migrations/0002_alter_profile_likedsongs.py diff --git a/server/userProfile/migrations/__init__.py b/server/proj/userProfile/migrations/__init__.py similarity index 100% rename from server/userProfile/migrations/__init__.py rename to server/proj/userProfile/migrations/__init__.py diff --git a/server/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc similarity index 100% rename from server/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc rename to server/proj/userProfile/migrations/__pycache__/0001_initial.cpython-310.pyc diff --git a/server/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc similarity index 100% rename from server/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc rename to server/proj/userProfile/migrations/__pycache__/0002_alter_profile_likedsongs.cpython-310.pyc diff --git a/server/userProfile/migrations/__pycache__/__init__.cpython-310.pyc b/server/proj/userProfile/migrations/__pycache__/__init__.cpython-310.pyc similarity index 100% rename from server/userProfile/migrations/__pycache__/__init__.cpython-310.pyc rename to server/proj/userProfile/migrations/__pycache__/__init__.cpython-310.pyc diff --git a/server/userProfile/models.py b/server/proj/userProfile/models.py similarity index 100% rename from server/userProfile/models.py rename to server/proj/userProfile/models.py diff --git a/server/userProfile/serializers.py b/server/proj/userProfile/serializers.py similarity index 100% rename from server/userProfile/serializers.py rename to server/proj/userProfile/serializers.py diff --git a/server/userProfile/tests.py b/server/proj/userProfile/tests.py similarity index 100% rename from server/userProfile/tests.py rename to server/proj/userProfile/tests.py diff --git a/server/userProfile/views.py b/server/proj/userProfile/views.py similarity index 100% rename from server/userProfile/views.py rename to server/proj/userProfile/views.py diff --git a/requirements.txt b/server/requirements.txt similarity index 100% rename from requirements.txt rename to server/requirements.txt