Switching to relative imports