Re-organizing  the structure