Upgrading to Fork CMS 3.7

Adding namespaces & class uses