Add separate boundingBox class, tidying up things