wip
Made large consolidations to directory structure. Removed unused files
Continued large consolidates including renaming of tpl to _tpl
more small consolidations