Renamed some modules for better structure.