Renamed and reordered some pathes to enhance readability