Moving HubSpot.php to a mroe sensible location