Fixing some bugs
Some reorganisation
Some reorganisation