Bugfixes in folder organisation.