Revert "endeavoru: Change storage layout (experimental and WIP)"

This reverts commit 79665848e6afc2b02d310fa384a4aed983380fb0.