Reorganizing the files a little