Merge pull request #610 from JWCook/merge-storage-classes

Merge serializer-specific storage classes into respective parent classes