Organizing to make this easier to use. (you don't have to see as many files