reorganising the structure