Fixing folder organisation.