Cleaned up daogrp definitions
Cleaned and organized ordering of file