Moved hbase to separate package