Add commands and vault packages and refactor everything for that