reorganized file tree