Fix multifile directory structure