Update structure and docs