rearrange all systems by feature and not by type