Fix last bugs. Restructuration finished and working as previously