moved Templates to Base PAckage