Revert "Changing ICAw to reflect new structure (#8)"

This should still be in a branch untill it is finished and well tested