Move inner class to top of class declaration