Reorganize requires
It's ok to create vaults
Old tests removed, using RSpec now
Some comments