More changes to fit satrapy dir struct