Folder Structure, properties fix