Add controller user, librairies & reorganization code in controller