Restructured and cleaned .config! // Bugfixes