*Manager classes get their own package

api/__init__.py

@@ -6,7 +6,7 @@ import cgi
 import uuid
 
 from web import app
-from user_manager import UserManager
+from managers.user import UserManager
 
 @app.before_request
 def set_formatter():

api/user.py

@@ -3,7 +3,7 @@
 from flask import request
 from web import app
 from db import User
-from user_manager import UserManager
+from managers.user import UserManager
 
 @app.route('/rest/getUser.view', methods = [ 'GET', 'POST' ])
 def user_info():

cli.py

@@ -75,7 +75,7 @@ if __name__ == "__main__":
 	import db
 	db.init_db()
 
-	from folder_manager import FolderManager
+	from managers.folder import FolderManager
 	from scanner import Scanner
 
 	if len(sys.argv) > 1:

folder.py

@@ -7,8 +7,8 @@ import uuid
 from web import app
 from db import session, Folder
 from scanner import Scanner
-from user_manager import UserManager
+from managers.user import UserManager
-from folder_manager import FolderManager
+from managers.folder import FolderManager
 
 @app.before_request
 def check_admin():

user.py

@@ -3,7 +3,7 @@
 from flask import request, session, flash, render_template, redirect, url_for, make_response
 
 from web import app
-from user_manager import UserManager
+from managers.user import UserManager
 from db import User, session as db_sess
 import uuid, csv
 import config

web.py

@@ -14,7 +14,7 @@ if config.get('base', 'log_file'):
 	app.logger.addHandler(handler)
 
 import db
-from user_manager import UserManager
+from managers.user import UserManager
 
 @app.before_request
 def init_and_login_check():