Fixed project folder structure