experimentating ;)

* I don't like the style of having one global only, this is not "pretty", and my vim autoindentation doesn't work well with it.
* I don't like having several objects on one line because this makes conflicts
* I don't like to have different objects that have no connections be together; here I tried to group them by "similarity" (if I can say)

This style doesn't solve all of them but... I don't know :)
(TBH I don't really care on a branch)