- Added Inner Classes to replace Controller Class