modify file structure by mike