Modules

@gustavonalle I've added an additional commit. Seems to work with my Infinispan snapshot