Reorganized Annotator Tab packages and classes.