Reorganising structure.
Structure succesfully reorganized. v2.1