Added lineGraph, refactored module names