fix manifest and dirs