Renamed the modules and some files to clear up their purpose.