Documentation and restructuring