More folder structure changes