Moving inner classes to new File