Upgrading to Fork CMS 3.7

Added namespaces & class uses