Fix directory structure again.