Cleanup, moved templates to /template folder.