Remove cmd.hpp and cmd.cpp, and update rest