modif file structure for themes integration