Migrating more functionality into StorageFormatManager.
Migrated more functionality into StorageFormatManager.

StorageFormatManager now houses only static methods.
Merged master.