Extra business classes

This PR extracts business classes and make some cosmetic fixes :kiss: