Restructuring the files a bit.