More Graph examples and awesome refactoring

Change-Id: I30c6ec1f051c3900475b1c33b2528b0c8a6412cf