Adding control server, changing directory organization