Organize the objects differently

Organize the objects differently