Merged storage classes into a single file