second change

Renamed and restructured the modules.