fixed conflict with folder directories/ added missing files