Revert "First outline of storage structs and classes"

This reverts commit 217d847e889a71f652f5e651a8865717cf8268bd.