Restructuring
Restructuring part2
Now as component