Consolidating with r7rs.html
Use more standard naming of main file