Starting refactoring to conform to MVC.

Signed-off-by: Szeren <samuelbyronwiley@gmail.com>