Updated Command Structure
Removed Listener Class (not needed).