Change organization of module