Moved common template sections into includes folder.