Revert "ubi folder"

This reverts commit 713ca2756aaacfcdd845ecea2e5f932ac401ffcd.