Restructuration of code