restructure the file tree