Try to fix up directory structure