Merge pull request #258 from gavincornwell/master

Moved and renamed OnPremise classes and constants to Legacy.