Putting the files in a better structure