Misc. bugfixes
Moved configuration files outside of main app.