Fix invalid package structure after import