Renamed Macros to Macro and made namespace file conventions consistent.
Minor naming style improvements.

Made all documentation groups singular, and moved namespace files back out to the proper directory so that their preprocessor tokens make sense.