Moved templates to template folder, removed scratch work and comments.