Damiano: re-organized the folders