[delivers #62201918] redo of file structure