fixing imports after flattening