Added Library Search and other reorganizations