Code Restructure, Merging CGI

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