Restructuration + Adding Menu (invisible for now, to be edited)