move some class at their respective folder