getlantern/lantern#1591 Moved some state classes into common