Fix up reader injection so namespaces work and redundant injection is ignored
Start to spread out AGS information across several files