Move dirs to reflect branding change