* Restructure header material * Clean up namespace type injections * Remove extraneous 'success' constants