Some minor repackaging in order to add a sample module.