major cleanup and refactoring of the request mapper hierarchy