Renaming unittest files to unittestgroup
Moving defines to defines.h