file-structure seem to have changed since some version