fixed inner class imports