Refactorize RAIDx