added template files
removed old classes for a rewrite