Changed source folder structure