Move up the packages. We'll put server side stuff elsewhere.

Signed-off-by: Nigel Magnay <nigel.magnay@gmail.com>