Changed project file structure