Relocated some classes