Code refactoring, moved modules on top level 💥 ✨

rpolak · Jul 2, 2018 · 6032547 · 6032547
1 parent 2be4b63
commit 6032547
Show file tree

Hide file tree

Showing 109 changed files with 41 additions and 49 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,8 +7,10 @@ bootstrap.min.css
 # Directory
 *.egg-info/
 env
+env3
 .idea
 .vscode
 dist
 .DS_Store
 .cache
+.pytest_cache/
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ install:
     - pip install coveralls
 
 script:
-    - coverage run --source src/pygmy -m py.test
+    - coverage run --source pygmy -m py.test
 
 after_success:
     - coveralls
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="src/pyui/static/logo/logov2.png" alt="pygmy" height="200px"></p>
+<p align="center"><img src="qolugo/static/logo/logov2.png" alt="pygmy" height="200px"></p>
 
 Pygmy
 =====
@@ -55,7 +55,7 @@ Technical Info
 
 - Python 3, Javascript, JQuery, HTML, CSS
 - REST API: Flask
-- Pyui: Django(It serves the web user interface)
+- Qolugo: Django(It serves the web user interface)
 - DB: PostgreSQL/MySQL/SQLite
 - Others: SQLAlchmey, JWT
 
@@ -77,12 +77,12 @@ NOTE: **This module only supports Python 3. Make sure pip and virtualenv are bot
 Note:
 
 1. The project has two config files:
-    - pygmy.cfg: `src/pygmy/config/pygmy.cfg` rest API and pygmy core settings file
-    - settings.py: `src/pyui/pyui/settings.py` Django settings file
+    - pygmy.cfg: `pygmy/config/pygmy.cfg` rest API and pygmy core settings file
+    - settings.py: `qolugo/qolugo/settings.py` Django settings file
 2. SQLite is default db, if you are using PostgreSQL or MySQL with this project, make sure they are installed into the system.
-3. To modify config settings vim `src/pygmy/config/pygmy.cfg`
+3. To modify config settings vim `pygmy/config/pygmy.cfg`
 4. You can run pygmy shell present in src directory to run the program on terminal. `python shell`
-5. By default in `src/pyui/pyui/settings.py` DEBUG is set to True, set it to False in production
+5. By default in `qolugo/qolugo/settings.py` DEBUG is set to True, set it to False in production
 
 DB Setup:
 =========
@@ -98,7 +98,7 @@ Check correct port:
 
 `mysqladmin variables | grep port`
 
-Change below line in `src/pygmy/core/pygmy.cfg`:
+Change below line in `pygmy/core/pygmy.cfg`:
 
 ```
 engine: mysql
@@ -150,7 +150,7 @@ Get Link:
 Shell Usage
 ===========
 
-Open shell using ./pygmy/src/shell. Available context is pygmy, Config, DB, etc. See all context by using pygmy_context.
+Open shell using ./shell. Available context is pygmy, Config, DB, etc. See all context by using pygmy_context.
 
 Shorten a link:
 
@@ -225,7 +225,7 @@ Docstring:
 How Link Stats Are Generated?
 =============================
 
-For getting geo location stats from IP maxminds' [GeoLite2-Country.mmd](http://pygy.co/cm) database is used. It's in `src/pygmy/app` directory.
+For getting geo location stats from IP maxminds' [GeoLite2-Country.mmd](http://pygy.co/cm) database is used. It's in `pygmy/app` directory.
 
 How Pygmy Auth Token Works?
 ===========================
@@ -237,7 +237,7 @@ Development
 
 Run tests and generate a coverage report:
 
-`coverage run --source src/pygmy -m py.test`
+`coverage run --source pygmy -m py.test`
 
 See coverage report:
 

diff --git a/init.d/pyui b/init.d/pyui
@@ -1,13 +1,13 @@
 #!/bin/bash
-# init.d script for pyui app
+# init.d script for qolugo app
 
-NAME=pyui
+NAME=qolugo
 PIDFILE=/var/run/$NAME.pid
 
 PORT=8000
-APP_DIR=/opt/pygyco/src/pyui
+APP_DIR=/opt/pygyco/qolugo
 PYTHONPATH='/opt/pygyco/env/bin/gunicorn'
-APP_ARGS='--log-file /var/log/pygmy/uierror_logs.log --access-logfile /var/log/pygmy/uiacclogs.log --bind 127.0.0.1:8000 --workers 2 pyui.wsgi'
+APP_ARGS='--log-file /var/log/pygmy/uierror_logs.log --access-logfile /var/log/pygmy/uiacclogs.log --bind 127.0.0.1:8000 --workers 2 qolugo.wsgi'
 APP_STOP_ARGS='--stop $PIDFILE'
 APP_RELOAD_ARGS='--reload $PIDFILE'
 

diff --git a/pygmy/__init__.py b/pygmy/__init__.py
@@ -0,0 +1 @@
+name = 'pygmy'
diff --git a/src/pygmy/app/GeoLite2-Country.mmdb → pygmy/app/GeoLite2-Country.mmdb b/src/pygmy/app/GeoLite2-Country.mmdb → pygmy/app/GeoLite2-Country.mmdb
diff --git a/src/pygmy/__init__.py → pygmy/app/__init__.py b/src/pygmy/__init__.py → pygmy/app/__init__.py
diff --git a/src/pygmy/app/auth.py → pygmy/app/auth.py b/src/pygmy/app/auth.py → pygmy/app/auth.py
diff --git a/src/pygmy/app/link.py → pygmy/app/link.py b/src/pygmy/app/link.py → pygmy/app/link.py
diff --git a/src/pygmy/config/__init__.py → pygmy/config/__init__.py b/src/pygmy/config/__init__.py → pygmy/config/__init__.py
diff --git a/src/pygmy/config/config.py → pygmy/config/config.py b/src/pygmy/config/config.py → pygmy/config/config.py
@@ -45,12 +45,12 @@ def initialize(self):
         self.schema = self.cfg['pygmy']['schema']
         self.host = self.cfg['pygmy']['host']
         self.port = self.cfg['pygmy']['port']
-        self.secret = self.cfg['rest']['flask_secret']
+        self.secret = self.cfg['pygmy']['flask_secret']
         self.webservice_url = "{0}://{1}:{2}".format(
             self.schema, self.host, self.port)
 
         if self.database['engine'] == 'sqlite3':
-            root_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+            root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
             sqlite_path = root_dir + '/' + self.database['data_dir'] + '/' + self.database['file_name']
             self.database['url'] = 'sqlite:///{}'.format(sqlite_path)
 
diff --git a/src/pygmy/config/pygmy.cfg → pygmy/config/pygmy.cfg b/src/pygmy/config/pygmy.cfg → pygmy/config/pygmy.cfg
@@ -10,21 +10,14 @@ short_url_schema = http://
 [database]
 file_name: pygmy.db
 engine: sqlite3
-url: sqlite:////var/lib/pygmy/pygmy.db
 data_dir = data
-# postgres://[email protected]:5432/pygmy
-# sqlite:////var/lib/pygmy/pygmy.db
+# url: postgres://[email protected]:5432/pygmy
 # mysql+pymysql://root:[email protected]:3306/pygmy
 user:
 password:
 host:
 port:
 
-[rest]
-host = 127.0.0.1
-port = 9119
-flask_secret = CvJHGFVBj*&^TRGBHDdBV836bdy73JJDHGV
-
 [auth]
 refresh_secret = _))_((*REFRESH)(*_)+_
 access_secret = +_)R@nd0m(_+

diff --git a/src/pygmy/config/pygmy_test.cfg → pygmy/config/pygmy_test.cfg b/src/pygmy/config/pygmy_test.cfg → pygmy/config/pygmy_test.cfg
@@ -2,29 +2,23 @@
 schema = http
 host = 0.0.0.0
 port = 9119
-debug = False
+debug = True
 flask_secret = CvJHGFVBj*&^TRGBHDdBV836bdy73JJDHGV
 short_url = 127.0.0.1
 short_url_schema = http://
 
 [database]
 file_name: pygmy_test.db
 engine: sqlite3
-url: sqlite:////var/lib/pygmy/pygmy_test.db
 data_dir = data
-# postgres://[email protected]:5432/pygmy
+# url: postgres://[email protected]:5432/pygmy
 # sqlite:////var/lib/pygmy/pygmy.db
 # mysql+pymysql://root:[email protected]:3306/pygmy
 user:
 password:
 host:
 port:
 
-[rest]
-host = 127.0.0.1
-port = 9119
-flask_secret = CvJHGFVBj*&^TRGBHDdBV836bdy73JJDHGV
-
 [auth]
 refresh_secret = _))_((*REFRESH)(*_)+_
 access_secret = +_)R@nd0m(_+

diff --git a/src/pygmy/core/__init__.py → pygmy/core/__init__.py b/src/pygmy/core/__init__.py → pygmy/core/__init__.py
diff --git a/src/pygmy/core/hashdigest.py → pygmy/core/hashdigest.py b/src/pygmy/core/hashdigest.py → pygmy/core/hashdigest.py
diff --git a/src/pygmy/core/initialize.py → pygmy/core/initialize.py b/src/pygmy/core/initialize.py → pygmy/core/initialize.py
@@ -5,7 +5,7 @@
 from pygmy.database.factory import DatabaseFactory
 
 _CONFIG_ENV_VAR = 'PYGMY_CONFIG_FILE'
-_CFG_PATHS = ['src/pygmy/config/pygmy.cfg', 'pygmy/config/pygmy.cfg', 'pygmy.cfg',
+_CFG_PATHS = ['pygmy/config/pygmy.cfg', 'pygmy.cfg',
               '$HOME/.pygmy.cfg', '/etc/pygmy.cfg'
               'tests/pygmy_test.cfg', 'pygmy/config/pygmy_test.cfg']
 

diff --git a/src/pygmy/core/request_parser.py → pygmy/core/request_parser.py b/src/pygmy/core/request_parser.py → pygmy/core/request_parser.py
diff --git a/src/data/README → pygmy/data/README b/src/data/README → pygmy/data/README
diff --git a/src/pygmy/app/__init__.py → pygmy/database/__init__.py b/src/pygmy/app/__init__.py → pygmy/database/__init__.py
diff --git a/src/pygmy/database/base.py → pygmy/database/base.py b/src/pygmy/database/base.py → pygmy/database/base.py
diff --git a/src/pygmy/database/dbutil.py → pygmy/database/dbutil.py b/src/pygmy/database/dbutil.py → pygmy/database/dbutil.py
diff --git a/src/pygmy/database/factory.py → pygmy/database/factory.py b/src/pygmy/database/factory.py → pygmy/database/factory.py
diff --git a/src/pygmy/database/mysql.py → pygmy/database/mysql.py b/src/pygmy/database/mysql.py → pygmy/database/mysql.py
diff --git a/src/pygmy/database/postgresql.py → pygmy/database/postgresql.py b/src/pygmy/database/postgresql.py → pygmy/database/postgresql.py
diff --git a/src/pygmy/database/sqlite.py → pygmy/database/sqlite.py b/src/pygmy/database/sqlite.py → pygmy/database/sqlite.py
diff --git a/src/pygmy/exception/__init__.py → pygmy/exception/__init__.py b/src/pygmy/exception/__init__.py → pygmy/exception/__init__.py
diff --git a/src/pygmy/exception/auth.py → pygmy/exception/auth.py b/src/pygmy/exception/auth.py → pygmy/exception/auth.py
diff --git a/src/pygmy/exception/error.py → pygmy/exception/error.py b/src/pygmy/exception/error.py → pygmy/exception/error.py
diff --git a/src/pygmy/exception/invalidurl.py → pygmy/exception/invalidurl.py b/src/pygmy/exception/invalidurl.py → pygmy/exception/invalidurl.py
diff --git a/src/pygmy/helpers/__init__.py → pygmy/helpers/__init__.py b/src/pygmy/helpers/__init__.py → pygmy/helpers/__init__.py
diff --git a/src/pygmy/helpers/link_helper.py → pygmy/helpers/link_helper.py b/src/pygmy/helpers/link_helper.py → pygmy/helpers/link_helper.py
diff --git a/src/pygmy/model/__init__.py → pygmy/model/__init__.py b/src/pygmy/model/__init__.py → pygmy/model/__init__.py
diff --git a/src/pygmy/model/clickmeta.py → pygmy/model/clickmeta.py b/src/pygmy/model/clickmeta.py → pygmy/model/clickmeta.py
diff --git a/src/pygmy/model/link.py → pygmy/model/link.py b/src/pygmy/model/link.py → pygmy/model/link.py
diff --git a/src/pygmy/model/user.py → pygmy/model/user.py b/src/pygmy/model/user.py → pygmy/model/user.py
diff --git a/src/pygmy/database/__init__.py → pygmy/rest/__init__.py b/src/pygmy/database/__init__.py → pygmy/rest/__init__.py
diff --git a/src/pygmy/rest/helpers.py → pygmy/rest/helpers.py b/src/pygmy/rest/helpers.py → pygmy/rest/helpers.py
diff --git a/src/pygmy/rest/jwt_views.py → pygmy/rest/jwt_views.py b/src/pygmy/rest/jwt_views.py → pygmy/rest/jwt_views.py
diff --git a/src/pygmy/rest/manage.py → pygmy/rest/manage.py b/src/pygmy/rest/manage.py → pygmy/rest/manage.py
diff --git a/src/pygmy/rest/shorturl.py → pygmy/rest/shorturl.py b/src/pygmy/rest/shorturl.py → pygmy/rest/shorturl.py
diff --git a/src/pygmy/rest/urls.py → pygmy/rest/urls.py b/src/pygmy/rest/urls.py → pygmy/rest/urls.py
diff --git a/src/pygmy/rest/user.py → pygmy/rest/user.py b/src/pygmy/rest/user.py → pygmy/rest/user.py
diff --git a/src/pygmy/rest/wsgi.py → pygmy/rest/wsgi.py b/src/pygmy/rest/wsgi.py → pygmy/rest/wsgi.py
diff --git a/src/pygmy/rest/__init__.py → pygmy/tests/__init__.py b/src/pygmy/rest/__init__.py → pygmy/tests/__init__.py
diff --git a/src/pygmy/tests/test_click_stats.py → pygmy/tests/test_click_stats.py b/src/pygmy/tests/test_click_stats.py → pygmy/tests/test_click_stats.py
diff --git a/...pygmy/tests/test_url_shorten_unshorten.py → pygmy/tests/test_url_shorten_unshorten.py b/...pygmy/tests/test_url_shorten_unshorten.py → pygmy/tests/test_url_shorten_unshorten.py
diff --git a/src/pygmy/utilities/__init__.py → pygmy/utilities/__init__.py b/src/pygmy/utilities/__init__.py → pygmy/utilities/__init__.py
diff --git a/src/pygmy/utilities/urls.py → pygmy/utilities/urls.py b/src/pygmy/utilities/urls.py → pygmy/utilities/urls.py
diff --git a/src/pygmy/utilities/utils.py → pygmy/utilities/utils.py b/src/pygmy/utilities/utils.py → pygmy/utilities/utils.py
diff --git a/src/pygmy/utilities/validator.py → pygmy/utilities/validator.py b/src/pygmy/utilities/validator.py → pygmy/utilities/validator.py
diff --git a/pygmy/validator/__init__.py b/pygmy/validator/__init__.py
@@ -0,0 +1 @@
+from .link import LinkSchema
diff --git a/src/pygmy/validator/link.py → pygmy/validator/link.py b/src/pygmy/validator/link.py → pygmy/validator/link.py
diff --git a/src/pygmy/validator/user.py → pygmy/validator/user.py b/src/pygmy/validator/user.py → pygmy/validator/user.py
diff --git a/src/pygmy_api_run.py → pygmy_api_run.py b/src/pygmy_api_run.py → pygmy_api_run.py
@@ -8,12 +8,15 @@
 
 
 if __name__ == '__main__':
+
     # TODO: Use argparsep
     if len(sys.argv) > 1 and sys.argv[1] == 'test':
         print('Running Pygmy API test server')
+
         config_path = 'pygmy/config/pygmy_test.cfg'
         db_file_path = tempfile.NamedTemporaryFile(suffix='.db').name
         db_path = "sqlite:///{}".format(db_file_path)
+
         initialize_test(config_path, db_url=db_path)
     else:
         print('Running Pygmy API server')

diff --git a/src/pygmy/tests/__init__.py → qolugo/__init__.py b/src/pygmy/tests/__init__.py → qolugo/__init__.py
diff --git a/src/pyui/manage.py → qolugo/manage.py b/src/pyui/manage.py → qolugo/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pyui.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "qolugo.settings")
     try:
         from django.core.management import execute_from_command_line
 

diff --git a/src/pyui/__init__.py → qolugo/middleware/__init__.py b/src/pyui/__init__.py → qolugo/middleware/__init__.py
diff --git a/src/pyui/middleware/exception.py → qolugo/middleware/exception.py b/src/pyui/middleware/exception.py → qolugo/middleware/exception.py
diff --git a/src/pyui/middleware/response.py → qolugo/middleware/response.py b/src/pyui/middleware/response.py → qolugo/middleware/response.py
diff --git a/src/pyui/middleware/__init__.py → qolugo/pygmy/__init__.py b/src/pyui/middleware/__init__.py → qolugo/pygmy/__init__.py
diff --git a/src/pyui/pygmy/apps.py → qolugo/pygmy/apps.py b/src/pyui/pygmy/apps.py → qolugo/pygmy/apps.py
diff --git a/src/pyui/pygmy/tests.py → qolugo/pygmy/tests.py b/src/pyui/pygmy/tests.py → qolugo/pygmy/tests.py
diff --git a/src/pyui/pygmy/urls.py → qolugo/pygmy/urls.py b/src/pyui/pygmy/urls.py → qolugo/pygmy/urls.py
diff --git a/src/pyui/pygmy/views.py → qolugo/pygmy/views.py b/src/pyui/pygmy/views.py → qolugo/pygmy/views.py
diff --git a/src/pyui/pygmy/__init__.py → qolugo/qolugo/__init__.py b/src/pyui/pygmy/__init__.py → qolugo/qolugo/__init__.py
diff --git a/src/pyui/pyui/generic_views.py → qolugo/qolugo/generic_views.py b/src/pyui/pyui/generic_views.py → qolugo/qolugo/generic_views.py
diff --git a/src/pyui/pyui/settings.py → qolugo/qolugo/settings.py b/src/pyui/pyui/settings.py → qolugo/qolugo/settings.py
@@ -52,7 +52,7 @@
     'middleware.exception.ExceptionMiddleware'
 ]
 
-ROOT_URLCONF = 'pyui.urls'
+ROOT_URLCONF = 'qolugo.urls'
 
 TEMPLATES = [
     {
@@ -79,7 +79,7 @@
 PROJECT_DIR = os.path.dirname(__file__)
 
 
-WSGI_APPLICATION = 'pyui.wsgi.application'
+WSGI_APPLICATION = 'qolugo.wsgi.application'
 
 
 # Database

diff --git a/src/pyui/pyui/urls.py → qolugo/qolugo/urls.py b/src/pyui/pyui/urls.py → qolugo/qolugo/urls.py
@@ -15,7 +15,7 @@
 """
 from django.conf import settings
 from django.conf.urls import url, include
-import pyui.generic_views as views
+import qolugo.generic_views as views
 
 
 urlpatterns = [
@@ -28,4 +28,4 @@
 
 if settings.DEBUG is True:
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-    urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += staticfiles_urlpatterns()
diff --git a/src/pyui/pyui/wsgi.py → qolugo/qolugo/wsgi.py b/src/pyui/pyui/wsgi.py → qolugo/qolugo/wsgi.py
@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pyui.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "qolugo.settings")
 
 application = get_wsgi_application()
diff --git a/src/pyui/restclient/__init__.py → qolugo/restclient/__init__.py b/src/pyui/restclient/__init__.py → qolugo/restclient/__init__.py
diff --git a/src/pyui/restclient/base.py → qolugo/restclient/base.py b/src/pyui/restclient/base.py → qolugo/restclient/base.py
diff --git a/src/pyui/restclient/error_msg.py → qolugo/restclient/error_msg.py b/src/pyui/restclient/error_msg.py → qolugo/restclient/error_msg.py
diff --git a/src/pyui/restclient/errors.py → qolugo/restclient/errors.py b/src/pyui/restclient/errors.py → qolugo/restclient/errors.py
diff --git a/src/pyui/restclient/pygmy.py → qolugo/restclient/pygmy.py b/src/pyui/restclient/pygmy.py → qolugo/restclient/pygmy.py
diff --git a/src/pyui/static/css/styles.css → qolugo/static/css/styles.css b/src/pyui/static/css/styles.css → qolugo/static/css/styles.css
diff --git a/src/pyui/static/js/app.js → qolugo/static/js/app.js b/src/pyui/static/js/app.js → qolugo/static/js/app.js
diff --git a/src/pyui/static/logo/logo.png → qolugo/static/logo/logo.png b/src/pyui/static/logo/logo.png → qolugo/static/logo/logo.png
diff --git a/src/pyui/static/logo/logo.svg → qolugo/static/logo/logo.svg b/src/pyui/static/logo/logo.svg → qolugo/static/logo/logo.svg
diff --git a/src/pyui/static/logo/logov2.png → qolugo/static/logo/logov2.png b/src/pyui/static/logo/logov2.png → qolugo/static/logo/logov2.png
diff --git a/src/pyui/static/logo/logov2.svg → qolugo/static/logo/logov2.svg b/src/pyui/static/logo/logov2.svg → qolugo/static/logo/logov2.svg
diff --git a/src/pyui/templates/400.html → qolugo/templates/400.html b/src/pyui/templates/400.html → qolugo/templates/400.html
diff --git a/src/pyui/templates/404.html → qolugo/templates/404.html b/src/pyui/templates/404.html → qolugo/templates/404.html
diff --git a/src/pyui/templates/500.html → qolugo/templates/500.html b/src/pyui/templates/500.html → qolugo/templates/500.html
diff --git a/src/pyui/templates/about.html → qolugo/templates/about.html b/src/pyui/templates/about.html → qolugo/templates/about.html
diff --git a/src/pyui/templates/auth/link_auth.html → qolugo/templates/auth/link_auth.html b/src/pyui/templates/auth/link_auth.html → qolugo/templates/auth/link_auth.html
diff --git a/src/pyui/templates/auth/login_status.html → qolugo/templates/auth/login_status.html b/src/pyui/templates/auth/login_status.html → qolugo/templates/auth/login_status.html
diff --git a/src/pyui/templates/base.html → qolugo/templates/base.html b/src/pyui/templates/base.html → qolugo/templates/base.html
@@ -16,7 +16,7 @@
     <link rel="stylesheet" href="/static/css/styles.css">
 
     <!--Favicon-->
-    <link rel="shortcut icon" type="image/png" href="/static/logo/logov2.ico"/>
+    <link rel="shortcut icon" type="image/png" href="/static/logo/logov2.png"/>
 
     <script src="//cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.7.1/clipboard.min.js"></script>
     <script src="/static/js/app.js"></script>

diff --git a/src/pyui/templates/contact.html → qolugo/templates/contact.html b/src/pyui/templates/contact.html → qolugo/templates/contact.html
diff --git a/src/pyui/templates/invalid_form.html → qolugo/templates/invalid_form.html b/src/pyui/templates/invalid_form.html → qolugo/templates/invalid_form.html
diff --git a/src/pyui/templates/pygmy/dashboard.html → qolugo/templates/pygmy/dashboard.html b/src/pyui/templates/pygmy/dashboard.html → qolugo/templates/pygmy/dashboard.html
diff --git a/src/pyui/templates/pygmy/index.html → qolugo/templates/pygmy/index.html b/src/pyui/templates/pygmy/index.html → qolugo/templates/pygmy/index.html
diff --git a/src/pyui/templates/pygmy/link_stats.html → qolugo/templates/pygmy/link_stats.html b/src/pyui/templates/pygmy/link_stats.html → qolugo/templates/pygmy/link_stats.html
diff --git a/src/pyui/templates/pygmy/short_url.html → qolugo/templates/pygmy/short_url.html b/src/pyui/templates/pygmy/short_url.html → qolugo/templates/pygmy/short_url.html
diff --git a/src/pyui/templates/unauthorized.html → qolugo/templates/unauthorized.html b/src/pyui/templates/unauthorized.html → qolugo/templates/unauthorized.html
diff --git a/src/pyui/pyui/__init__.py → qolugo/user_auth/__init__.py b/src/pyui/pyui/__init__.py → qolugo/user_auth/__init__.py
diff --git a/src/pyui/user_auth/apps.py → qolugo/user_auth/apps.py b/src/pyui/user_auth/apps.py → qolugo/user_auth/apps.py
diff --git a/src/pyui/user_auth/tests.py → qolugo/user_auth/tests.py b/src/pyui/user_auth/tests.py → qolugo/user_auth/tests.py
diff --git a/src/pyui/user_auth/urls.py → qolugo/user_auth/urls.py b/src/pyui/user_auth/urls.py → qolugo/user_auth/urls.py
diff --git a/src/pyui/user_auth/views.py → qolugo/user_auth/views.py b/src/pyui/user_auth/views.py → qolugo/user_auth/views.py
diff --git a/src/pyui/utils.py → qolugo/utils.py b/src/pyui/utils.py → qolugo/utils.py
diff --git a/src/run.py → run.py b/src/run.py → run.py
@@ -8,7 +8,7 @@
 
 
 PYGMY_API_ARGS = ['gunicorn', '-b 127.0.0.1:9119', '-w 1', 'pygmy.rest.wsgi:app']
-PYUI_ARGS = ['gunicorn', '-b 127.0.0.1:8000', '-w 1', 'pyui.wsgi']
+QOLUGO_ARGS = ['gunicorn', '-b 127.0.0.1:8000', '-w 1', 'qolugo.wsgi']
 process = []
 
 
@@ -25,8 +25,8 @@ def print_err(proc, timeout=2):
     # Print any configuration error
     print_err(process[-1])
     print("Starting development server at http://127.0.0.1:8000/")
-    os.chdir('src/pyui')
-    process.append(subprocess.Popen(PYUI_ARGS, stdout=subprocess.PIPE,
+    os.chdir('qolugo')
+    process.append(subprocess.Popen(QOLUGO_ARGS, stdout=subprocess.PIPE,
                                     stderr=subprocess.PIPE))
     # Print any configuration error
     print_err(process[-1])

diff --git a/src/shell → shell b/src/shell → shell
diff --git a/src/pygmy/validator/__init__.py b/src/pygmy/validator/__init__.py
diff --git a/src/tests/__init__.py b/src/tests/__init__.py
diff --git a/test.py b/test.py
diff --git a/src/pyui/user_auth/__init__.py → tests/__init__.py b/src/pyui/user_auth/__init__.py → tests/__init__.py
diff --git a/src/tests/conftest.py → tests/conftest.py b/src/tests/conftest.py → tests/conftest.py
diff --git a/src/tests/fixture.py → tests/fixture.py b/src/tests/fixture.py → tests/fixture.py
@@ -16,7 +16,7 @@ class PygmyApiTestServer:
     @classmethod
     def start_pygmy_api_server(cls):
         # os.chdir('src')
-        command = ['coverage', 'run', 'src/pygmy_api_run.py', 'test']
+        command = ['coverage', 'run', 'pygmy_api_run.py', 'test']
         cls.pygmyapi_proc = subprocess.Popen(
             command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         # Wait for server to start
@@ -36,8 +36,7 @@ class PygmyUiTestServer:
 
     @classmethod
     def start_pygmy_ui_server(cls):
-        # os.chdir('src/pyui')
-        command = ['gunicorn','-b 127.0.0.1:8000', '--chdir', 'src/pyui', '-w 1', 'pyui.wsgi']
+        command = ['gunicorn','-b 127.0.0.1:8001', '--chdir', 'qolugo', '-w 1', 'qolugo.wsgi']
         cls.pygmyui_proc = subprocess.Popen(
             command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         # Wait for server to start

diff --git a/src/tests/test_integration.py → tests/test_integration.py b/src/tests/test_integration.py → tests/test_integration.py
@@ -11,7 +11,7 @@ class PygmyIntegrationTest(unittest.TestCase):
 
     @classmethod
     def setup_class(cls):
-        cls.url = 'http://127.0.0.1:8000'
+        cls.url = 'http://127.0.0.1:8001'
 
     @classmethod
     def teardown_class(cls):