The annotations directory is propagated correctly to different modules.
fixed typos
resolve conflict