Cleanup to update paths and some box2d namespace issues