Reorganizing and adding schema.png