changed structure to all files