Restructure files and add acount infos