Revert "Abstracting template system, plus cleanup (untested)"

This reverts commit 212711caa49516be11b66014e086103f7ec4406f.
Revert "Changes to fix issues with versions"

This reverts commit 2afd03a349b7fe8ba2b125dcdaa0740f33fd2846.
Fixes stability issues (hopefully)