Extracted nested classes into individual files