Move CommandSet management to its own class

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>