Renamed some of the module files