Move annotations library into a separate package; Restore package structure to be a single module instead of a directory