move some private class to app