Take nested classes out of the impl classes