IMachine and IGenerator deleted, everything uses AbstractMachine and AbstractGenerator now. Testing for speed improvements.