Move guess.cpp to match structure of master