Fixing folder heirarchy