fix the broken import paths so things will compile