Restructured and fixed externals