Moving some class into some package