Simplifying code
Removed duplicate of codebase.
Rename of main code.
Corresponding commit for test engine.