Simple cleanup refactoring.
Rewrite archetype file source and adhoc source implementation. Simplify indexing mechanisms.