moved shared entities to own module, some brain wire