- Renamed doc and changed structure