Move things to macranger core