I recommend you not to stick to Moscow this time, but visit such places as Suzdal and Sergiev-Posad for example.