Rearranged categories of files a little.