migrated api billing and bms to submodules