More directory tree changes