Proposed folder structure changes