Some cleanup of various IS service.

[Review issue 7462001]
Simple package refactor for master API classes.

[Review issue ]
Update merge from local master.