Reorganized Templates, added Forms