Fixed ordering in 2d.cpp to reflect 2d.hpp