Small file tree refactoring. Won't change any depencies.