mostly folders reorganisations

* here are the modifications we discussed via email
* tell me what you think :)