make package paths conform to opam overlay convention

Conflicts:
	src/o2wPackage.ml
Edit link