Restructured repo template folder and adjusted the build to make it easier to switch to new language versions
Minor clean-up in the build file