Added Templates and changed module names, can't seem to get submodules to compile for now.