Move dia from JDS to oi-userland