Fix project folder structure