Added new template option
Fixed getopt loading issue
File reorg