Updated import code to use relative paths