[IAC] Some more refactoring and reorganization