Reorganise library structure