Create a few sub-packages and move stuff to them.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>