Solution周りを整備, close #9