Regoranization of code