Moved field entities & Created templates for future fields