Changed to project file structure