Move fvb to separate module