inner class move to individual class