Moved classes to dif files