Fix project file structure