reorg: clarifying organization
redirects: wiki links