Refactoring seems done, Engine merged into the main project.