Core: refactor storage layer, pt.1 (#391).

The storage bridge is about to be dropped completely.

See ticket 391.