Reshuffle data files
Use TMR make system
Paper resource file
2.5: paper map & fixes