Renamed Module and some further design refactoring