Moved sections into include files + revisions