Renamed modules in preparation for MVVM.