Add conga-annotations dependency
Some more restructuring