Removing stupid folder nesting