updated structur organitation