Restructering Graph Module, fixing the build