Restructure according to new module structure.