Fixing import paths within moved directories