Revert "Risistemazione"

This reverts commit 553335c5075857c5be01699f0261b3e37c7c0535.
Revert "Revert "Risistemazione""

This reverts commit 483475ce2a435af0048f68bdd18d7c5a9aabcb7b.