Renamed modules to create a more sane structure