Lots of cleanups. Split out zorka-common module with some common classes.