Split bvc module into submodules