Update README, move 2d out, update build