Make annotation annotate the main entity, and (optionally) part of it
Fix things broken from previous refactoring due to insufficient mvn clean diligence
Put annotations on the main item and link it to the relevant part
Clean up action manager
Merge changes to annotation api, along with some additional cleanups.