Refactor commands and add install command skeleton