Revert "Changing ICAw to reflect new structure (#8)"
Merge pull request #32 from mmagnuski/revert-27-new-structure

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