Refactoringgggg

Some more refactoring to better structure the StrangeIOC stuff.