Updated to resemble last changes in file names, rearranged