Move common template directories

Change-Id: I7073c047cc9021f59804eabe7c4925d6b42f181d