Restructuration and documentation