Split Mixed Template into Multi Template and Mixed Content

Change-Id: I1fa9f6c59c5f1b67044be6442d3e4da8fb1151bf