Renamed modules and consolidated dependencies.