fix directory structure again