Added QuadTrees and Refactored