Change code structures. Drop unused codes. Add EdgeMatchSolver.