Began to move templates of factories to core and began to implement e2.