updated project structure ... thanks Filippo