Renamed modules. Adjusted methods visibility
Renamed modules.