Moved CategoryMapper to Category namespace & renamed to DataMapper