refactoring engine and utility classes
merged with test classes that used to be located in a separate project.