Bug fix && restructuration