Tidying up configuration keys
Move Freemarker template processing to software/base