Migrated class templates into header
More restructuring and clean-up
Clearer comments and some minor tweaks
Accounting for removed namespace
Commented out content, in prep for coming rewrite