rearranging template folder, adding modal support to Cores tab