Turned Our project into something that follows MVC... ish