The mappers can now extract the data they mapped to the objects keeping the associations and the orders
Moved some classes around and deleted some old ones