Moved Paths into Path Macros
Moved macros into sub group
Changed Macro names to match namespace