Reorganise to fit library pattern