Move things around for relative imports