Renamed modules and some more refactoring.