added router, controller, view for graph
fix merge