Add a DataMapper class which replaces ResultBuilderFactory and QueryFact...

Add a DataMapper class which replaces ResultBuilderFactory and QueryFactory classes