Documentation and structural improvements