Consolidate block store and value store under single namespace

[tylerwilding-wk]

When they are in different directories, navigation and understanding is more difficult than it needs to be.