Renamed for consistency
Added new files to project