Split Commands and Events from main class