Moved code out of lib/.