Revert "Intermediate update to move everything to namespace, plus some stylistic fixes"

This reverts commit e218ad86ddfd081ee326f624b677bef5ba974672.
Added namespace box2d, did not rename objects