Relocated some stuff