Reorganizing #6 (Rename OldLookup.java)