Folder Structure
Minor changes.