Continued refactoring

Next commit will fully implement a user interface and quadtrees for collision