minor cleanup
move Rhino stuff into subpackage