Attempt to refactor ocamlfind package layout

This leaves the crazy module names untouched.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>