further simplifications of the Oasis subpackages and opam files