Rewrite components and structures in a new way