gros refactoring server + changement actions