Fix imports, add shutil as it's required