Renaming classes in preparation for URI handling changes
Added delegate method URI validations
Class rename
Stabilized processor code
Stabilized template file for Query methods
Removed unused methods after refactoring
Simplified dependency on Types and Elements