The problem started when I accidentally moved my entire /usr/share folder to a different directory. I moved it back to /usr/, but now when I try and startx, it times out.
Maybe its just a typo, but maybe /usr/share is now in /usr/usr/share!
Also, have you tried running the Reconfiguration script for X server?
I believe it is something like xorgcfg or xorgconfig.
This also is a nice command: xorgcfg -textmode