Modified structure

Warning : Global controller doesn't work for the moment !