Split commands and Events from main class