Make the structure more organized