Begin refactoring split of three and e3ga