basic cleanup, re-start works and produces a disease, TODOs: packages, sane strucure, move to DI, tests