Renamed module to match other adapters.
Fixed tests
WIP refactoring to match 4.2 structure