move waterfall out of ktbh core