Refactor graphics
Merge pull request #6 from stefanv/module_refactor

Refactor graphics
Clean up segmentation