Changed file extensions

Change-Id: Ieafa9775116e520e477770b0d3425ac5e0c6c8b5
Added template include files

Change-Id: Ie0f4ec41234f1114fc40f1c6d4f2c8fd58faf197