Fixes location of user_manager
Removes unused stuff
Moves code to modules
Code refactoring
Moves code to modules