Refactored four cardinal dirs in prep. for secondaries