some reorganization.
latest version of storage tank.