Merge pull request #464 from abhinavc/master

[Major]: Vault reorganized ...