Move ResultContainer class to separate file