Tidied up searches by putting everyrhing into lib.