Move out shiro stuff to obiba-shiro