more dir restructuring