refactor to use exact namespace dir structure; register annotation in tests