Changes to make file to get a nicer structure