Code restructuration