Refactored some classes, Vertex now contains color