change the structure of the files
fixed a bug