fixes for imports after moving code