Merged Eze changes with mine and reorganized routes