Re-organization, note revision, complete outline in picture.rb