pull everything extension related into Util and cleanup Util