Changed file names and reordered steps