Reorganize to add outpost support