Changes for the new IO library, mainly base-package modules moving around