Changed inner class to separate file