Cosmetic changes to comments
Move files to a directory that will be deleted, in preparation for simplification
Added back workbench files for schema diagrams