Adding Repetition code.
Restructure hierarchy.