[refactor] include our Commands
Merge branch 'refactor' into github