Fix import paths after reorganisation