Rearrange templates folder so that is is consistent with javascripts and less

Bug: 71523
Change-Id: I84e6d481211269090a9d3ad65a1d16dc74bc0104
Merge "Rearrange templates folder so that is is consistent with javascripts and less"