Make service internals more consistent
Rename daos package services
Add test.util.Factory