Moved forms to template directed folder