Fix imports etc. after moving