We call ours grumpy old man tortoise. He always draws his head when we come too close, even with food, like we plan to attack and eat him. He's never tried to bite us or charge at us, so I guess that's good? I'd rather not feel like he's scared for his life though.
Also, is the rearranging thing normal then? He's only recently started that. It's so funny because he'll move his hide so that he can't quite figure out how to get inside at night, and have to spend the night in his basking spot in the dark.