fix directory structure