restructed all files