Fixed import paths