Rewrite examples and rework file layout