Reorganise packages into sub-directories