Massive code-cleanup, using packetwrapper now