Tidy module structure.
Change module structure.