reorganized directory tree