endeavoru: Change storage layout (experimental and WIP)

Change-Id: I6bda6994ec9a9ca8a81ad6dab3bf3b7add3faf90