Compilation checkpoint after integrating some art and reorganizing.