Moved templates to templates dir