Re-arranged things, found new bugs in s5fs