Organized the files in the right conventions