[IAC] Code refactoring and reorganization