Switched to flat directory structure for project, fix debug-toolbar settings