Reorganized structure, provided default lookup directory.