More fixing of the package/module structure. Some work on Varol Rotem. Iterative varol rotem still broken.