Refactor storage inside manager.

Move storage into manager object.