Get rid of Market.ExternalMarket property for simplification purpose
Fix all tests
Move classes to separate files
Update backlog