Make Cabinet extend Folder

Cabinet and Folder now both extend a new class: Storage

Cabinet and Folder are still distinct classes, though currently there
is no reason for them to be distinguished. Investigate this issue
further, at a later time
Reorganize members of Item