Moving all annotations to Java API
Moving all annotations to Java API