Moved macro classes to separate namespace.