Reorg jsdoc WIP