Directory reshuffling, cleanup