Refactored with IStorage
Less assets.
Revert "Less assets."

This reverts commit 922054b28f046585bc96748fd1300c650e915760.
Fixed bugs.