change the organization of code