Made all of the inner classes public
Made all of the constructors public
Extracted the Machine class.