moving classes; references not updated