Moved all files to one dir.  Updated tests.
Integrated cmc with simulator with new class Interpreter