Reworked / Added to the examples. Some re aranges in src