Revert "Remove vault group and vault item"

This reverts commit 2af241ae5f5bb693f8ee0503fb70926b2725d6a4.