Reorganizing client components