Move templates/common/* directly into templates/