Reorganise lib dir