ISIS-833: completing the reorg of services into modules.

devutils and settings.