Organizational changes to the template:

* Creation of new template folders for template functions
* Files with system only code moved and renamed