Consolidate lib and lib64