Move a few libraries into their own modules