Tried to fix folder nesting