new structure for files and specs