Collapsing more stuff into the Storage class. FileSystem no longer handles change tracking itself.
Moving files to match class names.