Fixed folder structure changes