Fixed the order of files that get put in squash