Removed repository maper and repository layer, replaced by single layer

Removed Dibi dependency. The only dependency is some data storage class implementing iDataStorage interface.
Moved query construction from QueryCarrier to DataStorage
space after if