Moved form templates to subfolder.

Easier file management
Merge branch 'enhancements'