Reordering for easier inclusion on other projects