Refactor filesystems, comment out currently non-working verification