Major refactoring of console runner and infrastructure.