Started the refactoring of the runtime.