Added dirs and server