Major refactoring and naming all around

Began using Violet UML modeler and refactored the code to
reflect the design I have begun to create on it.