CMake alterations for stack_machine split
Cleanup stack machine
Reorg
Correct includes
Split apart some more