Remove residue of former structure
Rewrite intro
fix reference