Welcome to the Q&A Forum

1. Absolutely correct. - But make sure to upload new xml sitemap as well 2. Considering latest penguin update, if you re-do your site and make it live with well optimized (white hat only) pages and site structure. load speed, accessibility, content quality, etc. if all these points have been taken care of, there are no chances of rank drop, in fact it should improve. P.S. don't concentrate to much on keywords, use them naturally/genuinely. Create attractive/meaningful meta tags. Hope I was able to answer you query properly. Best of luck