Fixed IC2 API files

Old files had been included as well as up-to-date files due to folder
structure changes.
Fixed IC2 imports
Merge pull request #113 from Tallinu/master

This should have fixed the IC2 API mixup...