More examples, changed folder structure