Corrected naming and structure in project