Preparing for major refactoring

* Kicking out infrastructure for non-IRL