changed the organization of everything