Reorganising structure

Reorganising structure