Fix imports to use the full package path