rearranging folders, added templates