Add more organization to the files