Refactor graphs package from Win7 work