CitoEngine · extremeunix · Nov 15, 2014 · Nov 9, 2014 · Nov 9, 2014 · Nov 9, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -8,11 +8,11 @@ install:
     - "pip install coveralls"
 before_script: 
     - mysql -e 'create database cito;'
-    - python manage.py syncdb --noinput
-    - python manage.py migrate
+    - python app/manage.py syncdb --noinput
+    - python app/manage.py migrate
 # command to run tests
 script: 
-    - coverage run --source='.' --omit=tests*,fabfile*,*admin*,*urls*,*manage*,*/settings/*,*wsgi*,*/migrations/*  manage.py test
+    - coverage run --source='.' --omit=tests*,fabfile*,*admin*,*urls*,*manage*,*/settings/*,*wsgi*,*/migrations/*  app/manage.py test
 after_success:
     - coveralls
 notifications:

diff --git a/appauth/migrations/__init__.py → app/__init__.py b/appauth/migrations/__init__.py → app/__init__.py
diff --git a/api/__init__.py → app/api/__init__.py b/api/__init__.py → app/api/__init__.py
diff --git a/api/incident_listener.py → app/api/incident_listener.py b/api/incident_listener.py → app/api/incident_listener.py
diff --git a/api/json_responses.py → app/api/json_responses.py b/api/json_responses.py → app/api/json_responses.py
diff --git a/appauth/__init__.py → app/appauth/__init__.py b/appauth/__init__.py → app/appauth/__init__.py
diff --git a/appauth/migrations/0001_initial.py → app/appauth/migrations/0001_initial.py b/appauth/migrations/0001_initial.py → app/appauth/migrations/0001_initial.py
diff --git a/cito_engine/migrations/__init__.py → app/appauth/migrations/__init__.py b/cito_engine/migrations/__init__.py → app/appauth/migrations/__init__.py
diff --git a/appauth/models.py → app/appauth/models.py b/appauth/models.py → app/appauth/models.py
diff --git a/appauth/views.py → app/appauth/views.py b/appauth/views.py → app/appauth/views.py
diff --git a/audit/__init__.py → app/audit/__init__.py b/audit/__init__.py → app/audit/__init__.py
diff --git a/audit/auditlog.py → app/audit/auditlog.py b/audit/auditlog.py → app/audit/auditlog.py
diff --git a/audit/models.py → app/audit/models.py b/audit/models.py → app/audit/models.py
diff --git a/cito/__init__.py → app/cito_engine/__init__.py b/cito/__init__.py → app/cito_engine/__init__.py
diff --git a/cito_engine/actions/__init__.py → app/cito_engine/actions/__init__.py b/cito_engine/actions/__init__.py → app/cito_engine/actions/__init__.py
diff --git a/cito_engine/actions/event_actions.py → app/cito_engine/actions/event_actions.py b/cito_engine/actions/event_actions.py → app/cito_engine/actions/event_actions.py
diff --git a/cito_engine/actions/export_utils.py → app/cito_engine/actions/export_utils.py b/cito_engine/actions/export_utils.py → app/cito_engine/actions/export_utils.py
diff --git a/cito_engine/actions/incidents.py → app/cito_engine/actions/incidents.py b/cito_engine/actions/incidents.py → app/cito_engine/actions/incidents.py
diff --git a/cito_engine/actions/json_formatter.py → app/cito_engine/actions/json_formatter.py b/cito_engine/actions/json_formatter.py → app/cito_engine/actions/json_formatter.py
diff --git a/cito_engine/admin.py → app/cito_engine/admin.py b/cito_engine/admin.py → app/cito_engine/admin.py
diff --git a/cito_engine/forms/__init__.py → app/cito_engine/forms/__init__.py b/cito_engine/forms/__init__.py → app/cito_engine/forms/__init__.py
diff --git a/cito_engine/forms/categories.py → app/cito_engine/forms/categories.py b/cito_engine/forms/categories.py → app/cito_engine/forms/categories.py
diff --git a/cito_engine/forms/eventactions.py → app/cito_engine/forms/eventactions.py b/cito_engine/forms/eventactions.py → app/cito_engine/forms/eventactions.py
diff --git a/cito_engine/forms/events.py → app/cito_engine/forms/events.py b/cito_engine/forms/events.py → app/cito_engine/forms/events.py
diff --git a/cito_engine/forms/incidents.py → app/cito_engine/forms/incidents.py b/cito_engine/forms/incidents.py → app/cito_engine/forms/incidents.py
diff --git a/cito_engine/forms/permissions.py → app/cito_engine/forms/permissions.py b/cito_engine/forms/permissions.py → app/cito_engine/forms/permissions.py
diff --git a/cito_engine/forms/pluginserver.py → app/cito_engine/forms/pluginserver.py b/cito_engine/forms/pluginserver.py → app/cito_engine/forms/pluginserver.py
diff --git a/cito_engine/forms/teams.py → app/cito_engine/forms/teams.py b/cito_engine/forms/teams.py → app/cito_engine/forms/teams.py
diff --git a/cito_engine/forms/tools_form.py → app/cito_engine/forms/tools_form.py b/cito_engine/forms/tools_form.py → app/cito_engine/forms/tools_form.py
diff --git a/cito_engine/forms/user_form.py → app/cito_engine/forms/user_form.py b/cito_engine/forms/user_form.py → app/cito_engine/forms/user_form.py
diff --git a/cito_engine/management/__init__.py → app/cito_engine/management/__init__.py b/cito_engine/management/__init__.py → app/cito_engine/management/__init__.py
diff --git a/cito_engine/management/commands/__init__.py → ...to_engine/management/commands/__init__.py b/cito_engine/management/commands/__init__.py → ...to_engine/management/commands/__init__.py
diff --git a/cito_engine/management/commands/poller.py → ...cito_engine/management/commands/poller.py b/cito_engine/management/commands/poller.py → ...cito_engine/management/commands/poller.py
diff --git a/cito_engine/migrations/0001_initial.py → app/cito_engine/migrations/0001_initial.py b/cito_engine/migrations/0001_initial.py → app/cito_engine/migrations/0001_initial.py
diff --git a/...auto__add_field_incident_is_suppressed.py → ...auto__add_field_incident_is_suppressed.py b/...auto__add_field_incident_is_suppressed.py → ...auto__add_field_incident_is_suppressed.py
diff --git a/comments/migrations/__init__.py → app/cito_engine/migrations/__init__.py b/comments/migrations/__init__.py → app/cito_engine/migrations/__init__.py
diff --git a/cito_engine/models.py → app/cito_engine/models.py b/cito_engine/models.py → app/cito_engine/models.py
diff --git a/cito_engine/poller/__init__.py → app/cito_engine/poller/__init__.py b/cito_engine/poller/__init__.py → app/cito_engine/poller/__init__.py
diff --git a/cito_engine/poller/event_poller.py → app/cito_engine/poller/event_poller.py b/cito_engine/poller/event_poller.py → app/cito_engine/poller/event_poller.py
diff --git a/cito_engine/poller/pluginpoller.py → app/cito_engine/poller/pluginpoller.py b/cito_engine/poller/pluginpoller.py → app/cito_engine/poller/pluginpoller.py
diff --git a/cito_engine/views/__init__.py → app/cito_engine/views/__init__.py b/cito_engine/views/__init__.py → app/cito_engine/views/__init__.py
diff --git a/cito_engine/views/categories.py → app/cito_engine/views/categories.py b/cito_engine/views/categories.py → app/cito_engine/views/categories.py
diff --git a/cito_engine/views/dashboards.py → app/cito_engine/views/dashboards.py b/cito_engine/views/dashboards.py → app/cito_engine/views/dashboards.py
diff --git a/cito_engine/views/eventactions.py → app/cito_engine/views/eventactions.py b/cito_engine/views/eventactions.py → app/cito_engine/views/eventactions.py
diff --git a/cito_engine/views/events.py → app/cito_engine/views/events.py b/cito_engine/views/events.py → app/cito_engine/views/events.py
diff --git a/cito_engine/views/incidents.py → app/cito_engine/views/incidents.py b/cito_engine/views/incidents.py → app/cito_engine/views/incidents.py
diff --git a/cito_engine/views/pluginservers.py → app/cito_engine/views/pluginservers.py b/cito_engine/views/pluginservers.py → app/cito_engine/views/pluginservers.py
diff --git a/cito_engine/views/teams.py → app/cito_engine/views/teams.py b/cito_engine/views/teams.py → app/cito_engine/views/teams.py
diff --git a/cito_engine/views/tools.py → app/cito_engine/views/tools.py b/cito_engine/views/tools.py → app/cito_engine/views/tools.py
diff --git a/cito_engine/views/userviews.py → app/cito_engine/views/userviews.py b/cito_engine/views/userviews.py → app/cito_engine/views/userviews.py
diff --git a/comments/__init__.py → app/comments/__init__.py b/comments/__init__.py → app/comments/__init__.py
diff --git a/comments/admin.py → app/comments/admin.py b/comments/admin.py → app/comments/admin.py
diff --git a/comments/forms.py → app/comments/forms.py b/comments/forms.py → app/comments/forms.py
diff --git a/comments/migrations/0001_initial.py → app/comments/migrations/0001_initial.py b/comments/migrations/0001_initial.py → app/comments/migrations/0001_initial.py
diff --git a/reports/migrations/__init__.py → app/comments/migrations/__init__.py b/reports/migrations/__init__.py → app/comments/migrations/__init__.py
diff --git a/comments/models.py → app/comments/models.py b/comments/models.py → app/comments/models.py
diff --git a/comments/views.py → app/comments/views.py b/comments/views.py → app/comments/views.py
diff --git a/manage.py → app/manage.py b/manage.py → app/manage.py
@@ -18,7 +18,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cito.settings.production")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.production")
 
     from django.core.management import execute_from_command_line
 

diff --git a/queue_manager/__init__.py → app/queue_manager/__init__.py b/queue_manager/__init__.py → app/queue_manager/__init__.py
diff --git a/queue_manager/rabbitmq/__init__.py → app/queue_manager/rabbitmq/__init__.py b/queue_manager/rabbitmq/__init__.py → app/queue_manager/rabbitmq/__init__.py
diff --git a/queue_manager/rabbitmq/rabbitmq_reader.py → ...queue_manager/rabbitmq/rabbitmq_reader.py b/queue_manager/rabbitmq/rabbitmq_reader.py → ...queue_manager/rabbitmq/rabbitmq_reader.py
diff --git a/queue_manager/rabbitmq/rabbitmq_writer.py → ...queue_manager/rabbitmq/rabbitmq_writer.py b/queue_manager/rabbitmq/rabbitmq_writer.py → ...queue_manager/rabbitmq/rabbitmq_writer.py
diff --git a/queue_manager/sqs/__init__.py → app/queue_manager/sqs/__init__.py b/queue_manager/sqs/__init__.py → app/queue_manager/sqs/__init__.py
diff --git a/queue_manager/sqs/sqs_reader.py → app/queue_manager/sqs/sqs_reader.py b/queue_manager/sqs/sqs_reader.py → app/queue_manager/sqs/sqs_reader.py
diff --git a/queue_manager/sqs/sqs_writer.py → app/queue_manager/sqs/sqs_writer.py b/queue_manager/sqs/sqs_writer.py → app/queue_manager/sqs/sqs_writer.py
diff --git a/reports/__init__.py → app/reports/__init__.py b/reports/__init__.py → app/reports/__init__.py
diff --git a/reports/actions.py → app/reports/actions.py b/reports/actions.py → app/reports/actions.py
diff --git a/reports/admin.py → app/reports/admin.py b/reports/admin.py → app/reports/admin.py
diff --git a/reports/forms.py → app/reports/forms.py b/reports/forms.py → app/reports/forms.py
diff --git a/reports/migrations/0001_initial.py → app/reports/migrations/0001_initial.py b/reports/migrations/0001_initial.py → app/reports/migrations/0001_initial.py
diff --git a/rules_engine/__init__.py → app/reports/migrations/__init__.py b/rules_engine/__init__.py → app/reports/migrations/__init__.py
diff --git a/reports/models.py → app/reports/models.py b/reports/models.py → app/reports/models.py
diff --git a/reports/views.py → app/reports/views.py b/reports/views.py → app/reports/views.py
diff --git a/rules_engine/migrations/__init__.py → app/rules_engine/__init__.py b/rules_engine/migrations/__init__.py → app/rules_engine/__init__.py
diff --git a/rules_engine/forms.py → app/rules_engine/forms.py b/rules_engine/forms.py → app/rules_engine/forms.py
diff --git a/rules_engine/lib/__init__.py → app/rules_engine/lib/__init__.py b/rules_engine/lib/__init__.py → app/rules_engine/lib/__init__.py
diff --git a/rules_engine/lib/suppressors.py → app/rules_engine/lib/suppressors.py b/rules_engine/lib/suppressors.py → app/rules_engine/lib/suppressors.py
diff --git a/rules_engine/migrations/0001_initial.py → app/rules_engine/migrations/0001_initial.py b/rules_engine/migrations/0001_initial.py → app/rules_engine/migrations/0001_initial.py
diff --git a/app/rules_engine/migrations/__init__.py b/app/rules_engine/migrations/__init__.py
diff --git a/rules_engine/models.py → app/rules_engine/models.py b/rules_engine/models.py → app/rules_engine/models.py
diff --git a/rules_engine/views.py → app/rules_engine/views.py b/rules_engine/views.py → app/rules_engine/views.py
diff --git a/cito/settings/__init__.py → app/settings/__init__.py b/cito/settings/__init__.py → app/settings/__init__.py
diff --git a/cito/settings/base.py → app/settings/base.py b/cito/settings/base.py → app/settings/base.py
@@ -16,7 +16,7 @@
 
 import os
 import sys
-import logging
+
 try:
     from unipath import Path
 except ImportError:
@@ -129,10 +129,10 @@
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'cito.urls'
+ROOT_URLCONF = 'settings.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'cito.wsgi.application'
+WSGI_APPLICATION = 'settings.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -159,12 +159,16 @@
     'audit',
 )
 
-STATIC_FILES = PROJECT_ROOT.ancestor(1).child('staticfiles')
+STATIC_FILES = PROJECT_ROOT.child('staticfiles')
 
 INCIDENT_PARAMS = ['event', 'timestamp']
 
 LOGIN_URL = '/login/'
 
+AWS_CONF = dict()
+RABBITMQ_CONF = dict()
+POLLER_CONFIG = dict()
+
 try:
     from .secret_key import *
 except ImportError:
@@ -174,4 +178,4 @@
 try:
     from .ldap_auth import *
 except ImportError:
-    print "LDAP settings not found or mis-configured, CitEngine will use internal authentication"
+    print "LDAP settings not found or mis-configured, CitEngine will use internal authentication"
diff --git a/cito/settings/dev.py → app/settings/dev.py b/cito/settings/dev.py → app/settings/dev.py
@@ -127,7 +127,6 @@
 ##################################
 # AWS::SQS Configuration settings
 ##################################
-AWS_CONF = dict()
 AWS_CONF['region'] = 'us-east-1'
 AWS_CONF['awskey'] = ''
 AWS_CONF['awssecret'] = ''
@@ -137,7 +136,6 @@
 ##################################
 # RabbitMQ Configuration settings
 ##################################
-RABBITMQ_CONF = dict()
 RABBITMQ_CONF['host'] = 'localhost'
 RABBITMQ_CONF['port'] = 5672
 RABBITMQ_CONF['username'] = 'cito_user'
@@ -157,7 +155,6 @@
 ##############################
 # Event Poller config
 ##############################
-POLLER_CONFIG = dict()
 
 # Polling interval in seconds
 POLLER_CONFIG['interval'] = 5
@@ -169,22 +166,3 @@
 # Leave this to 60 seconds if you don't know what you are doing.
 POLLER_CONFIG['visibility'] = 60
 
-
-########################################
-# Dispatcher config
-# (will be deprecated in future release
-########################################
-DISPATCHER_CONFIG = dict()
-
-# Polling interval
-DISPATCHER_CONFIG['interval'] = 10
-
-# Job lock expire time
-DISPATCHER_CONFIG['lock_expire'] = 30
-
-
-##############################
-# Event Listener config
-##############################
-EVENT_LISTENER_CONFIG = dict()
-EVENT_LISTENER_CONFIG['port'] = 8080
diff --git a/cito/settings/ldap_auth.py → app/settings/ldap_auth.py b/cito/settings/ldap_auth.py → app/settings/ldap_auth.py
diff --git a/cito/settings/production.py → app/settings/production.py b/cito/settings/production.py → app/settings/production.py
@@ -126,7 +126,6 @@
 ##################################
 # AWS::SQS Configuration settings
 ##################################
-AWS_CONF = dict()
 AWS_CONF['region'] = 'us-east-1'
 AWS_CONF['awskey'] = ''
 AWS_CONF['awssecret'] = ''
@@ -136,7 +135,6 @@
 ##################################
 # RabbitMQ Configuration settings
 ##################################
-RABBITMQ_CONF = dict()
 RABBITMQ_CONF['host'] = 'localhost'
 RABBITMQ_CONF['port'] = 5672
 RABBITMQ_CONF['username'] = 'cito_user'
@@ -156,7 +154,6 @@
 ##############################
 # Event Poller config
 ##############################
-POLLER_CONFIG = dict()
 
 # Polling interval in seconds
 POLLER_CONFIG['interval'] = 5
@@ -167,23 +164,3 @@
 # How long should the poller hold on the the message before someone else picks it up on
 # Leave this to 60 seconds if you don't know what you are doing.
 POLLER_CONFIG['visibility'] = 60
-
-
-########################################
-# Dispatcher config
-# (will be deprecated in future release
-########################################
-DISPATCHER_CONFIG = dict()
-
-# Polling interval
-DISPATCHER_CONFIG['interval'] = 10
-
-# Job lock expire time
-DISPATCHER_CONFIG['lock_expire'] = 30
-
-
-##############################
-# Event Listener config
-##############################
-EVENT_LISTENER_CONFIG = dict()
-EVENT_LISTENER_CONFIG['port'] = 8080
diff --git a/cito/settings/secret_key.py → app/settings/secret_key.py b/cito/settings/secret_key.py → app/settings/secret_key.py
diff --git a/cito/urls.py → app/settings/urls.py b/cito/urls.py → app/settings/urls.py
diff --git a/cito/wsgi.py → app/settings/wsgi.py b/cito/wsgi.py → app/settings/wsgi.py
diff --git a/staticfiles/admin/css/base.css → app/staticfiles/admin/css/base.css b/staticfiles/admin/css/base.css → app/staticfiles/admin/css/base.css
diff --git a/staticfiles/admin/css/changelists.css → app/staticfiles/admin/css/changelists.css b/staticfiles/admin/css/changelists.css → app/staticfiles/admin/css/changelists.css
diff --git a/staticfiles/admin/css/dashboard.css → app/staticfiles/admin/css/dashboard.css b/staticfiles/admin/css/dashboard.css → app/staticfiles/admin/css/dashboard.css
diff --git a/staticfiles/admin/css/forms.css → app/staticfiles/admin/css/forms.css b/staticfiles/admin/css/forms.css → app/staticfiles/admin/css/forms.css
diff --git a/staticfiles/admin/css/ie.css → app/staticfiles/admin/css/ie.css b/staticfiles/admin/css/ie.css → app/staticfiles/admin/css/ie.css
diff --git a/staticfiles/admin/css/login.css → app/staticfiles/admin/css/login.css b/staticfiles/admin/css/login.css → app/staticfiles/admin/css/login.css
diff --git a/staticfiles/admin/css/rtl.css → app/staticfiles/admin/css/rtl.css b/staticfiles/admin/css/rtl.css → app/staticfiles/admin/css/rtl.css
diff --git a/staticfiles/admin/css/widgets.css → app/staticfiles/admin/css/widgets.css b/staticfiles/admin/css/widgets.css → app/staticfiles/admin/css/widgets.css
diff --git a/staticfiles/admin/img/changelist-bg.gif → app/staticfiles/admin/img/changelist-bg.gif b/staticfiles/admin/img/changelist-bg.gif → app/staticfiles/admin/img/changelist-bg.gif
diff --git a/staticfiles/admin/img/changelist-bg_rtl.gif → ...aticfiles/admin/img/changelist-bg_rtl.gif b/staticfiles/admin/img/changelist-bg_rtl.gif → ...aticfiles/admin/img/changelist-bg_rtl.gif
diff --git a/staticfiles/admin/img/chooser-bg.gif → app/staticfiles/admin/img/chooser-bg.gif b/staticfiles/admin/img/chooser-bg.gif → app/staticfiles/admin/img/chooser-bg.gif
diff --git a/staticfiles/admin/img/chooser_stacked-bg.gif → ...ticfiles/admin/img/chooser_stacked-bg.gif b/staticfiles/admin/img/chooser_stacked-bg.gif → ...ticfiles/admin/img/chooser_stacked-bg.gif
diff --git a/staticfiles/admin/img/default-bg-reverse.gif → ...ticfiles/admin/img/default-bg-reverse.gif b/staticfiles/admin/img/default-bg-reverse.gif → ...ticfiles/admin/img/default-bg-reverse.gif
diff --git a/staticfiles/admin/img/default-bg.gif → app/staticfiles/admin/img/default-bg.gif b/staticfiles/admin/img/default-bg.gif → app/staticfiles/admin/img/default-bg.gif
diff --git a/staticfiles/admin/img/deleted-overlay.gif → ...staticfiles/admin/img/deleted-overlay.gif b/staticfiles/admin/img/deleted-overlay.gif → ...staticfiles/admin/img/deleted-overlay.gif
diff --git a/...icfiles/admin/img/gis/move_vertex_off.png → ...icfiles/admin/img/gis/move_vertex_off.png b/...icfiles/admin/img/gis/move_vertex_off.png → ...icfiles/admin/img/gis/move_vertex_off.png
diff --git a/staticfiles/admin/img/gis/move_vertex_on.png → ...ticfiles/admin/img/gis/move_vertex_on.png b/staticfiles/admin/img/gis/move_vertex_on.png → ...ticfiles/admin/img/gis/move_vertex_on.png
diff --git a/staticfiles/admin/img/icon-no.gif → app/staticfiles/admin/img/icon-no.gif b/staticfiles/admin/img/icon-no.gif → app/staticfiles/admin/img/icon-no.gif
diff --git a/staticfiles/admin/img/icon-unknown.gif → app/staticfiles/admin/img/icon-unknown.gif b/staticfiles/admin/img/icon-unknown.gif → app/staticfiles/admin/img/icon-unknown.gif
diff --git a/staticfiles/admin/img/icon-yes.gif → app/staticfiles/admin/img/icon-yes.gif b/staticfiles/admin/img/icon-yes.gif → app/staticfiles/admin/img/icon-yes.gif
diff --git a/staticfiles/admin/img/icon_addlink.gif → app/staticfiles/admin/img/icon_addlink.gif b/staticfiles/admin/img/icon_addlink.gif → app/staticfiles/admin/img/icon_addlink.gif
diff --git a/staticfiles/admin/img/icon_alert.gif → app/staticfiles/admin/img/icon_alert.gif b/staticfiles/admin/img/icon_alert.gif → app/staticfiles/admin/img/icon_alert.gif
diff --git a/staticfiles/admin/img/icon_calendar.gif → app/staticfiles/admin/img/icon_calendar.gif b/staticfiles/admin/img/icon_calendar.gif → app/staticfiles/admin/img/icon_calendar.gif
diff --git a/staticfiles/admin/img/icon_changelink.gif → ...staticfiles/admin/img/icon_changelink.gif b/staticfiles/admin/img/icon_changelink.gif → ...staticfiles/admin/img/icon_changelink.gif
diff --git a/staticfiles/admin/img/icon_clock.gif → app/staticfiles/admin/img/icon_clock.gif b/staticfiles/admin/img/icon_clock.gif → app/staticfiles/admin/img/icon_clock.gif
diff --git a/staticfiles/admin/img/icon_deletelink.gif → ...staticfiles/admin/img/icon_deletelink.gif b/staticfiles/admin/img/icon_deletelink.gif → ...staticfiles/admin/img/icon_deletelink.gif
diff --git a/staticfiles/admin/img/icon_error.gif → app/staticfiles/admin/img/icon_error.gif b/staticfiles/admin/img/icon_error.gif → app/staticfiles/admin/img/icon_error.gif
diff --git a/staticfiles/admin/img/icon_searchbox.png → app/staticfiles/admin/img/icon_searchbox.png b/staticfiles/admin/img/icon_searchbox.png → app/staticfiles/admin/img/icon_searchbox.png
diff --git a/staticfiles/admin/img/icon_success.gif → app/staticfiles/admin/img/icon_success.gif b/staticfiles/admin/img/icon_success.gif → app/staticfiles/admin/img/icon_success.gif
diff --git a/staticfiles/admin/img/inline-delete-8bit.png → ...ticfiles/admin/img/inline-delete-8bit.png b/staticfiles/admin/img/inline-delete-8bit.png → ...ticfiles/admin/img/inline-delete-8bit.png
diff --git a/staticfiles/admin/img/inline-delete.png → app/staticfiles/admin/img/inline-delete.png b/staticfiles/admin/img/inline-delete.png → app/staticfiles/admin/img/inline-delete.png
diff --git a/...icfiles/admin/img/inline-restore-8bit.png → ...icfiles/admin/img/inline-restore-8bit.png b/...icfiles/admin/img/inline-restore-8bit.png → ...icfiles/admin/img/inline-restore-8bit.png
diff --git a/staticfiles/admin/img/inline-restore.png → app/staticfiles/admin/img/inline-restore.png b/staticfiles/admin/img/inline-restore.png → app/staticfiles/admin/img/inline-restore.png
diff --git a/staticfiles/admin/img/inline-splitter-bg.gif → ...ticfiles/admin/img/inline-splitter-bg.gif b/staticfiles/admin/img/inline-splitter-bg.gif → ...ticfiles/admin/img/inline-splitter-bg.gif
diff --git a/staticfiles/admin/img/nav-bg-grabber.gif → app/staticfiles/admin/img/nav-bg-grabber.gif b/staticfiles/admin/img/nav-bg-grabber.gif → app/staticfiles/admin/img/nav-bg-grabber.gif
diff --git a/staticfiles/admin/img/nav-bg-reverse.gif → app/staticfiles/admin/img/nav-bg-reverse.gif b/staticfiles/admin/img/nav-bg-reverse.gif → app/staticfiles/admin/img/nav-bg-reverse.gif
diff --git a/staticfiles/admin/img/nav-bg-selected.gif → ...staticfiles/admin/img/nav-bg-selected.gif b/staticfiles/admin/img/nav-bg-selected.gif → ...staticfiles/admin/img/nav-bg-selected.gif
diff --git a/staticfiles/admin/img/nav-bg.gif → app/staticfiles/admin/img/nav-bg.gif b/staticfiles/admin/img/nav-bg.gif → app/staticfiles/admin/img/nav-bg.gif
diff --git a/staticfiles/admin/img/selector-icons.gif → app/staticfiles/admin/img/selector-icons.gif b/staticfiles/admin/img/selector-icons.gif → app/staticfiles/admin/img/selector-icons.gif
diff --git a/staticfiles/admin/img/selector-search.gif → ...staticfiles/admin/img/selector-search.gif b/staticfiles/admin/img/selector-search.gif → ...staticfiles/admin/img/selector-search.gif
diff --git a/staticfiles/admin/img/sorting-icons.gif → app/staticfiles/admin/img/sorting-icons.gif b/staticfiles/admin/img/sorting-icons.gif → app/staticfiles/admin/img/sorting-icons.gif
diff --git a/staticfiles/admin/img/tool-left.gif → app/staticfiles/admin/img/tool-left.gif b/staticfiles/admin/img/tool-left.gif → app/staticfiles/admin/img/tool-left.gif
diff --git a/staticfiles/admin/img/tool-left_over.gif → app/staticfiles/admin/img/tool-left_over.gif b/staticfiles/admin/img/tool-left_over.gif → app/staticfiles/admin/img/tool-left_over.gif
diff --git a/staticfiles/admin/img/tool-right.gif → app/staticfiles/admin/img/tool-right.gif b/staticfiles/admin/img/tool-right.gif → app/staticfiles/admin/img/tool-right.gif
diff --git a/staticfiles/admin/img/tool-right_over.gif → ...staticfiles/admin/img/tool-right_over.gif b/staticfiles/admin/img/tool-right_over.gif → ...staticfiles/admin/img/tool-right_over.gif
diff --git a/staticfiles/admin/img/tooltag-add.gif → app/staticfiles/admin/img/tooltag-add.gif b/staticfiles/admin/img/tooltag-add.gif → app/staticfiles/admin/img/tooltag-add.gif
diff --git a/staticfiles/admin/img/tooltag-add_over.gif → ...taticfiles/admin/img/tooltag-add_over.gif b/staticfiles/admin/img/tooltag-add_over.gif → ...taticfiles/admin/img/tooltag-add_over.gif
diff --git a/staticfiles/admin/img/tooltag-arrowright.gif → ...ticfiles/admin/img/tooltag-arrowright.gif b/staticfiles/admin/img/tooltag-arrowright.gif → ...ticfiles/admin/img/tooltag-arrowright.gif
diff --git a/...les/admin/img/tooltag-arrowright_over.gif → ...les/admin/img/tooltag-arrowright_over.gif b/...les/admin/img/tooltag-arrowright_over.gif → ...les/admin/img/tooltag-arrowright_over.gif
diff --git a/staticfiles/admin/js/LICENSE-JQUERY.txt → app/staticfiles/admin/js/LICENSE-JQUERY.txt b/staticfiles/admin/js/LICENSE-JQUERY.txt → app/staticfiles/admin/js/LICENSE-JQUERY.txt
diff --git a/staticfiles/admin/js/SelectBox.js → app/staticfiles/admin/js/SelectBox.js b/staticfiles/admin/js/SelectBox.js → app/staticfiles/admin/js/SelectBox.js
diff --git a/staticfiles/admin/js/SelectFilter2.js → app/staticfiles/admin/js/SelectFilter2.js b/staticfiles/admin/js/SelectFilter2.js → app/staticfiles/admin/js/SelectFilter2.js
diff --git a/staticfiles/admin/js/actions.js → app/staticfiles/admin/js/actions.js b/staticfiles/admin/js/actions.js → app/staticfiles/admin/js/actions.js
diff --git a/staticfiles/admin/js/actions.min.js → app/staticfiles/admin/js/actions.min.js b/staticfiles/admin/js/actions.min.js → app/staticfiles/admin/js/actions.min.js
diff --git a/...files/admin/js/admin/DateTimeShortcuts.js → ...files/admin/js/admin/DateTimeShortcuts.js b/...files/admin/js/admin/DateTimeShortcuts.js → ...files/admin/js/admin/DateTimeShortcuts.js
diff --git a/...es/admin/js/admin/RelatedObjectLookups.js → ...es/admin/js/admin/RelatedObjectLookups.js b/...es/admin/js/admin/RelatedObjectLookups.js → ...es/admin/js/admin/RelatedObjectLookups.js
diff --git a/staticfiles/admin/js/admin/ordering.js → app/staticfiles/admin/js/admin/ordering.js b/staticfiles/admin/js/admin/ordering.js → app/staticfiles/admin/js/admin/ordering.js
diff --git a/staticfiles/admin/js/calendar.js → app/staticfiles/admin/js/calendar.js b/staticfiles/admin/js/calendar.js → app/staticfiles/admin/js/calendar.js
diff --git a/staticfiles/admin/js/collapse.js → app/staticfiles/admin/js/collapse.js b/staticfiles/admin/js/collapse.js → app/staticfiles/admin/js/collapse.js
diff --git a/staticfiles/admin/js/collapse.min.js → app/staticfiles/admin/js/collapse.min.js b/staticfiles/admin/js/collapse.min.js → app/staticfiles/admin/js/collapse.min.js
diff --git a/staticfiles/admin/js/compress.py → app/staticfiles/admin/js/compress.py b/staticfiles/admin/js/compress.py → app/staticfiles/admin/js/compress.py
diff --git a/staticfiles/admin/js/core.js → app/staticfiles/admin/js/core.js b/staticfiles/admin/js/core.js → app/staticfiles/admin/js/core.js
diff --git a/...icfiles/admin/js/getElementsBySelector.js → ...icfiles/admin/js/getElementsBySelector.js b/...icfiles/admin/js/getElementsBySelector.js → ...icfiles/admin/js/getElementsBySelector.js
diff --git a/staticfiles/admin/js/inlines.js → app/staticfiles/admin/js/inlines.js b/staticfiles/admin/js/inlines.js → app/staticfiles/admin/js/inlines.js
diff --git a/staticfiles/admin/js/inlines.min.js → app/staticfiles/admin/js/inlines.min.js b/staticfiles/admin/js/inlines.min.js → app/staticfiles/admin/js/inlines.min.js
diff --git a/staticfiles/admin/js/jquery.init.js → app/staticfiles/admin/js/jquery.init.js b/staticfiles/admin/js/jquery.init.js → app/staticfiles/admin/js/jquery.init.js
diff --git a/staticfiles/admin/js/jquery.js → app/staticfiles/admin/js/jquery.js b/staticfiles/admin/js/jquery.js → app/staticfiles/admin/js/jquery.js
diff --git a/staticfiles/admin/js/jquery.min.js → app/staticfiles/admin/js/jquery.min.js b/staticfiles/admin/js/jquery.min.js → app/staticfiles/admin/js/jquery.min.js
diff --git a/staticfiles/admin/js/prepopulate.js → app/staticfiles/admin/js/prepopulate.js b/staticfiles/admin/js/prepopulate.js → app/staticfiles/admin/js/prepopulate.js
diff --git a/staticfiles/admin/js/prepopulate.min.js → app/staticfiles/admin/js/prepopulate.min.js b/staticfiles/admin/js/prepopulate.min.js → app/staticfiles/admin/js/prepopulate.min.js
diff --git a/staticfiles/admin/js/timeparse.js → app/staticfiles/admin/js/timeparse.js b/staticfiles/admin/js/timeparse.js → app/staticfiles/admin/js/timeparse.js
diff --git a/staticfiles/admin/js/urlify.js → app/staticfiles/admin/js/urlify.js b/staticfiles/admin/js/urlify.js → app/staticfiles/admin/js/urlify.js
diff --git a/staticfiles/css/bootstrap-rowlink.css → app/staticfiles/css/bootstrap-rowlink.css b/staticfiles/css/bootstrap-rowlink.css → app/staticfiles/css/bootstrap-rowlink.css
diff --git a/staticfiles/css/bootstrap.min.css → app/staticfiles/css/bootstrap.min.css b/staticfiles/css/bootstrap.min.css → app/staticfiles/css/bootstrap.min.css
diff --git a/...ui-bg_diagonals-small_50_ff3853_40x40.png → ...ui-bg_diagonals-small_50_ff3853_40x40.png b/...ui-bg_diagonals-small_50_ff3853_40x40.png → ...ui-bg_diagonals-small_50_ff3853_40x40.png
diff --git a/...images/ui-bg_dots-small_50_9ce3b3_2x2.png → ...images/ui-bg_dots-small_50_9ce3b3_2x2.png b/...images/ui-bg_dots-small_50_9ce3b3_2x2.png → ...images/ui-bg_dots-small_50_9ce3b3_2x2.png
diff --git a/...ss/images/ui-bg_flat_35_35414f_40x100.png → ...ss/images/ui-bg_flat_35_35414f_40x100.png b/...ss/images/ui-bg_flat_35_35414f_40x100.png → ...ss/images/ui-bg_flat_35_35414f_40x100.png
diff --git a/...ss/images/ui-bg_flat_40_eaf04c_40x100.png → ...ss/images/ui-bg_flat_40_eaf04c_40x100.png b/...ss/images/ui-bg_flat_40_eaf04c_40x100.png → ...ss/images/ui-bg_flat_40_eaf04c_40x100.png
diff --git a/...ss/images/ui-bg_flat_75_ba9217_40x100.png → ...ss/images/ui-bg_flat_75_ba9217_40x100.png b/...ss/images/ui-bg_flat_75_ba9217_40x100.png → ...ss/images/ui-bg_flat_75_ba9217_40x100.png
diff --git a/...ss/images/ui-bg_flat_75_eaf04c_40x100.png → ...ss/images/ui-bg_flat_75_eaf04c_40x100.png b/...ss/images/ui-bg_flat_75_eaf04c_40x100.png → ...ss/images/ui-bg_flat_75_eaf04c_40x100.png
diff --git a/...ss/images/ui-bg_flat_75_ffffff_40x100.png → ...ss/images/ui-bg_flat_75_ffffff_40x100.png b/...ss/images/ui-bg_flat_75_ffffff_40x100.png → ...ss/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/...ges/ui-bg_glow-ball_80_ffff38_600x600.png → ...ges/ui-bg_glow-ball_80_ffff38_600x600.png b/...ges/ui-bg_glow-ball_80_ffff38_600x600.png → ...ges/ui-bg_glow-ball_80_ffff38_600x600.png
diff --git a/...es/ui-bg_white-lines_85_f7f7ba_40x100.png → ...es/ui-bg_white-lines_85_f7f7ba_40x100.png b/...es/ui-bg_white-lines_85_f7f7ba_40x100.png → ...es/ui-bg_white-lines_85_f7f7ba_40x100.png
diff --git a/...es/css/images/ui-icons_454545_256x240.png → ...es/css/images/ui-icons_454545_256x240.png b/...es/css/images/ui-icons_454545_256x240.png → ...es/css/images/ui-icons_454545_256x240.png
diff --git a/...es/css/images/ui-icons_88a206_256x240.png → ...es/css/images/ui-icons_88a206_256x240.png b/...es/css/images/ui-icons_88a206_256x240.png → ...es/css/images/ui-icons_88a206_256x240.png
diff --git a/...es/css/images/ui-icons_c02669_256x240.png → ...es/css/images/ui-icons_c02669_256x240.png b/...es/css/images/ui-icons_c02669_256x240.png → ...es/css/images/ui-icons_c02669_256x240.png
diff --git a/...es/css/images/ui-icons_e1e463_256x240.png → ...es/css/images/ui-icons_e1e463_256x240.png b/...es/css/images/ui-icons_e1e463_256x240.png → ...es/css/images/ui-icons_e1e463_256x240.png
diff --git a/...es/css/images/ui-icons_ffeb33_256x240.png → ...es/css/images/ui-icons_ffeb33_256x240.png b/...es/css/images/ui-icons_ffeb33_256x240.png → ...es/css/images/ui-icons_ffeb33_256x240.png
diff --git a/...es/css/images/ui-icons_ffffff_256x240.png → ...es/css/images/ui-icons_ffffff_256x240.png b/...es/css/images/ui-icons_ffffff_256x240.png → ...es/css/images/ui-icons_ffffff_256x240.png
diff --git a/staticfiles/css/stylesheet.css → app/staticfiles/css/stylesheet.css b/staticfiles/css/stylesheet.css → app/staticfiles/css/stylesheet.css
diff --git a/staticfiles/images/cito_logo1_large.xcf → app/staticfiles/images/cito_logo1_large.xcf b/staticfiles/images/cito_logo1_large.xcf → app/staticfiles/images/cito_logo1_large.xcf
diff --git a/staticfiles/images/cito_logo_small.png → app/staticfiles/images/cito_logo_small.png b/staticfiles/images/cito_logo_small.png → app/staticfiles/images/cito_logo_small.png
diff --git a/app/staticfiles/images/citoengine_white.png b/app/staticfiles/images/citoengine_white.png
diff --git a/staticfiles/images/icon.png → app/staticfiles/images/icon.png b/staticfiles/images/icon.png → app/staticfiles/images/icon.png
diff --git a/...cfiles/img/glyphicons-halflings-white.png → ...cfiles/img/glyphicons-halflings-white.png b/...cfiles/img/glyphicons-halflings-white.png → ...cfiles/img/glyphicons-halflings-white.png
diff --git a/staticfiles/img/glyphicons-halflings.png → app/staticfiles/img/glyphicons-halflings.png b/staticfiles/img/glyphicons-halflings.png → app/staticfiles/img/glyphicons-halflings.png
diff --git a/staticfiles/js/bootstrap-dropdown.js → app/staticfiles/js/bootstrap-dropdown.js b/staticfiles/js/bootstrap-dropdown.js → app/staticfiles/js/bootstrap-dropdown.js
diff --git a/staticfiles/js/bootstrap-rowlink.js → app/staticfiles/js/bootstrap-rowlink.js b/staticfiles/js/bootstrap-rowlink.js → app/staticfiles/js/bootstrap-rowlink.js
diff --git a/staticfiles/js/bootstrap-tab.js → app/staticfiles/js/bootstrap-tab.js b/staticfiles/js/bootstrap-tab.js → app/staticfiles/js/bootstrap-tab.js
diff --git a/staticfiles/js/bootstrap.min.js → app/staticfiles/js/bootstrap.min.js b/staticfiles/js/bootstrap.min.js → app/staticfiles/js/bootstrap.min.js
diff --git a/staticfiles/js/flot/jquery.flot.min.js → app/staticfiles/js/flot/jquery.flot.min.js b/staticfiles/js/flot/jquery.flot.min.js → app/staticfiles/js/flot/jquery.flot.min.js
diff --git a/staticfiles/js/flot/jquery.flot.pie.js → app/staticfiles/js/flot/jquery.flot.pie.js b/staticfiles/js/flot/jquery.flot.pie.js → app/staticfiles/js/flot/jquery.flot.pie.js
diff --git a/staticfiles/js/flot/jquery.flot.time.min.js → ...aticfiles/js/flot/jquery.flot.time.min.js b/staticfiles/js/flot/jquery.flot.time.min.js → ...aticfiles/js/flot/jquery.flot.time.min.js
diff --git a/staticfiles/js/jquery-1.10.2.min.js → app/staticfiles/js/jquery-1.10.2.min.js b/staticfiles/js/jquery-1.10.2.min.js → app/staticfiles/js/jquery-1.10.2.min.js
diff --git a/staticfiles/js/jquery-2.1.0.min.js → app/staticfiles/js/jquery-2.1.0.min.js b/staticfiles/js/jquery-2.1.0.min.js → app/staticfiles/js/jquery-2.1.0.min.js
diff --git a/cito/templates/bulk_upload.html → app/templates/bulk_upload.html b/cito/templates/bulk_upload.html → app/templates/bulk_upload.html
diff --git a/cito/templates/dashboard_team_views.html → app/templates/dashboard_team_views.html b/cito/templates/dashboard_team_views.html → app/templates/dashboard_team_views.html
diff --git a/cito/templates/eventaction_form.html → app/templates/eventaction_form.html b/cito/templates/eventaction_form.html → app/templates/eventaction_form.html
diff --git a/cito/templates/footer.html → app/templates/footer.html b/cito/templates/footer.html → app/templates/footer.html
diff --git a/cito/templates/generic_form.html → app/templates/generic_form.html b/cito/templates/generic_form.html → app/templates/generic_form.html
diff --git a/cito/templates/header.html → app/templates/header.html b/cito/templates/header.html → app/templates/header.html
diff --git a/cito/templates/js_eventaction_params.html → app/templates/js_eventaction_params.html b/cito/templates/js_eventaction_params.html → app/templates/js_eventaction_params.html
diff --git a/cito/templates/js_view_pie_chart.html → app/templates/js_view_pie_chart.html b/cito/templates/js_view_pie_chart.html → app/templates/js_view_pie_chart.html
diff --git a/cito/templates/js_view_reports.html → app/templates/js_view_reports.html b/cito/templates/js_view_reports.html → app/templates/js_view_reports.html
diff --git a/cito/templates/login.html → app/templates/login.html b/cito/templates/login.html → app/templates/login.html
@@ -55,7 +55,7 @@
 
     <div class="box-content">
           <form action="/login/" method="post" class="form-signin">
-              <a class="brand" href="/"> <img src="/content/images/cito_logo_small.png" /> </a>
+              <a class="brand" href="/"> <img src="/content/images/citoengine_white.png" /> </a>
             {% if state %}
                 <div class="alert alert-danger">{{ state }}</div>
             {% endif %}

diff --git a/cito/templates/logout.html → app/templates/logout.html b/cito/templates/logout.html → app/templates/logout.html
diff --git a/cito/templates/noscript.html → app/templates/noscript.html b/cito/templates/noscript.html → app/templates/noscript.html
diff --git a/cito/templates/reports_all_incidents.html → app/templates/reports_all_incidents.html b/cito/templates/reports_all_incidents.html → app/templates/reports_all_incidents.html
diff --git a/cito/templates/reports_events_in_system.html → app/templates/reports_events_in_system.html b/cito/templates/reports_events_in_system.html → app/templates/reports_events_in_system.html
diff --git a/...plates/reports_incidents_per_element.html → ...plates/reports_incidents_per_element.html b/...plates/reports_incidents_per_element.html → ...plates/reports_incidents_per_element.html
diff --git a/...emplates/reports_incidents_per_event.html → ...emplates/reports_incidents_per_event.html b/...emplates/reports_incidents_per_event.html → ...emplates/reports_incidents_per_event.html
diff --git a/...plates/reports_most_alerted_elements.html → ...plates/reports_most_alerted_elements.html b/...plates/reports_most_alerted_elements.html → ...plates/reports_most_alerted_elements.html
diff --git a/cito/templates/success_msg.html → app/templates/success_msg.html b/cito/templates/success_msg.html → app/templates/success_msg.html
diff --git a/cito/templates/top_nav_bar.html → app/templates/top_nav_bar.html b/cito/templates/top_nav_bar.html → app/templates/top_nav_bar.html
@@ -7,7 +7,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </a>
-            <a class="brand" href="/"> <img src="/content/images/cito_logo_small.png" /> </a>
+            <div style="width: 230px"> <a class="brand" href="/"> <img src="/content/images/citoengine_white.png" /> </a></div>
             <div >
                 <ul class="nav">
                     <!--*****Drop Down Menu 0 ***** -->

diff --git a/cito/templates/unauthorized.html → app/templates/unauthorized.html b/cito/templates/unauthorized.html → app/templates/unauthorized.html
diff --git a/cito/templates/view_all_events.html → app/templates/view_all_events.html b/cito/templates/view_all_events.html → app/templates/view_all_events.html
diff --git a/cito/templates/view_all_incidents.html → app/templates/view_all_incidents.html b/cito/templates/view_all_incidents.html → app/templates/view_all_incidents.html
diff --git a/cito/templates/view_all_pluginservers.html → app/templates/view_all_pluginservers.html b/cito/templates/view_all_pluginservers.html → app/templates/view_all_pluginservers.html
diff --git a/cito/templates/view_all_users.html → app/templates/view_all_users.html b/cito/templates/view_all_users.html → app/templates/view_all_users.html
diff --git a/cito/templates/view_categories.html → app/templates/view_categories.html b/cito/templates/view_categories.html → app/templates/view_categories.html
diff --git a/cito/templates/view_elements.html → app/templates/view_elements.html b/cito/templates/view_elements.html → app/templates/view_elements.html
diff --git a/cito/templates/view_event.html → app/templates/view_event.html b/cito/templates/view_event.html → app/templates/view_event.html
diff --git a/cito/templates/view_incident.html → app/templates/view_incident.html b/cito/templates/view_incident.html → app/templates/view_incident.html
diff --git a/cito/templates/view_pluginserver.html → app/templates/view_pluginserver.html b/cito/templates/view_pluginserver.html → app/templates/view_pluginserver.html
diff --git a/cito/templates/view_suppression.html → app/templates/view_suppression.html b/cito/templates/view_suppression.html → app/templates/view_suppression.html
diff --git a/cito/templates/view_teams.html → app/templates/view_teams.html b/cito/templates/view_teams.html → app/templates/view_teams.html
diff --git a/cito/templates/view_user.html → app/templates/view_user.html b/cito/templates/view_user.html → app/templates/view_user.html
diff --git a/cito_engine/__init__.py → app/tests/__init__.py b/cito_engine/__init__.py → app/tests/__init__.py
diff --git a/tests/factories.py → app/tests/factories.py b/tests/factories.py → app/tests/factories.py
diff --git a/tests/test_actions_json_formatter.py → app/tests/test_actions_json_formatter.py b/tests/test_actions_json_formatter.py → app/tests/test_actions_json_formatter.py
diff --git a/tests/test_appauth_views.py → app/tests/test_appauth_views.py b/tests/test_appauth_views.py → app/tests/test_appauth_views.py
diff --git a/tests/test_category_views.py → app/tests/test_category_views.py b/tests/test_category_views.py → app/tests/test_category_views.py
diff --git a/tests/test_comments_view.py → app/tests/test_comments_view.py b/tests/test_comments_view.py → app/tests/test_comments_view.py
diff --git a/tests/test_dashboard_views.py → app/tests/test_dashboard_views.py b/tests/test_dashboard_views.py → app/tests/test_dashboard_views.py
diff --git a/tests/test_event_views.py → app/tests/test_event_views.py b/tests/test_event_views.py → app/tests/test_event_views.py
diff --git a/tests/test_eventactions.py → app/tests/test_eventactions.py b/tests/test_eventactions.py → app/tests/test_eventactions.py
diff --git a/tests/test_eventactions_views.py → app/tests/test_eventactions_views.py b/tests/test_eventactions_views.py → app/tests/test_eventactions_views.py
diff --git a/tests/test_events.py → app/tests/test_events.py b/tests/test_events.py → app/tests/test_events.py
diff --git a/tests/test_incident_views.py → app/tests/test_incident_views.py b/tests/test_incident_views.py → app/tests/test_incident_views.py
diff --git a/tests/test_pluginserver_views.py → app/tests/test_pluginserver_views.py b/tests/test_pluginserver_views.py → app/tests/test_pluginserver_views.py
diff --git a/tests/test_report_actions.py → app/tests/test_report_actions.py b/tests/test_report_actions.py → app/tests/test_report_actions.py
diff --git a/tests/test_suppressorpipline.py → app/tests/test_suppressorpipline.py b/tests/test_suppressorpipline.py → app/tests/test_suppressorpipline.py
diff --git a/tests/test_team_views.py → app/tests/test_team_views.py b/tests/test_team_views.py → app/tests/test_team_views.py
diff --git a/tests/test_tools_views.py → app/tests/test_tools_views.py b/tests/test_tools_views.py → app/tests/test_tools_views.py
diff --git a/tests/test_user_views.py → app/tests/test_user_views.py b/tests/test_user_views.py → app/tests/test_user_views.py
diff --git a/tests/__init__.py b/tests/__init__.py