More improvements to the structure of the code, examples in the readme