Bugfixing invalid folder structure