UF-15 Pull out the workbench annotations and annotation processors into a small, separate module. Some structural fixes