Revert "Revert "Final structure""

This reverts commit f7a04789b2ba7d267becfa36f82f2ada2d4c661c.