Break 2d stuff into separate namespace