Move to relative import paths