doc + restructure