Consolidated the storage files into their own namespace
Removed the _deleted field and replaced it with a new storage status field to allow for transaction-like behavior later on