Renamed modules to fit better with multiple project strategy.