Complete reorganization to support multiple "machines".