simplify package name, add mock message bus