Moved to Bc namespace, refactoring, tests