Reorganized, added subvolume class.