small updates
slight package cleanup after a refocus on IOC requirements