Reorganisation

Added an example, reorganizing a bit