rearranged filesys