rearrange; added migrate and faq modules; patch for profile2