Restructured data access objects, added factory method
p4#: 20471