Moving code out of the ozp-iwc base project