moved templates to have a single consistent module
deleted old template dir