-- re-ordering system componets, based on core functionality, outwards