refactor api namespaces and annotations
resolve conflict