Moving more stuff to new makefiles

UCC git Repository :: git.ucc.asn.au