In progress -- extracting dealer module
Refactoring of dealer module complete