Help with 2year old sleeping

Hello.I have a 2 yr old daughter who for about 6months has been crying excessively before naps and bedtime.she will scream very loudly.she does not appear to be afraid of the dark.she also wakes up in the night angrily and kicks her feet and groans.I am not sure if she is fully awake when doing so.She asks to take. Her cup of water to bed and often wakes up to drink it.she is a very bright child.and learns things quickly.she is very curious and tends to be shy around strangers.she is very stubborn and independently minded.she has been very clingy lately.We just moved from CA(USA) about 6 weeks ago.She does not want me to leave her in any of her children's classes.she is frightened of the vacuum.and she does not like to be confined.please help!