Did some refactoring to be clearer on what files did what.