Fixing folder organisation related bug