Frantically moved things around before assignment 3 submission.
pipair modified to accomodate moved files.