made some organisation in all the programs