Reorganized files.
Added support for template inclusion.