Move things to better packages.

Change-Id: I09dbef9c56cba5a7db7b4561874cf69de8ba2b9f
Reviewed-on: http://gerrit.dmdirc.com/3831
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>