Further messing with import paths