Updating the libraries. Moved some things around.