Moved the classed into the right packages