After you get your website moved and the code cleaned up, be sure to submit it via:
http://www.google.com/analytics/
AND
http://www.google.com/webmasters/
These are NOT THE SAME.. so do both if you haven't already. I find Analytics very helpful.
Good luck,
Kim