move api request classes into right package