Sort out the import paths