Renamed Project modules and classes
typos