refacorting + use the new Btrfs code in running system