restructed file-stuff a little, one failure is found, but i couldn't send..