moving template related classes to own package
moving template related classes to own package
simplified naps task