XD-22 refactored dirt to depend on module