Re-arrange libraries a bit

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>