more shuffling around imports