fix broken build because of moved types/packages