Renamed files #22
Another clean up #22