move some classes to inner classes
Import and create new repos. Needs more validation/tests