Some billing components were in the org settings module and needed to be moved the org billing module