finished refactoring, tests passing again, hadoop xattrs next