Moved classed into right directory