Cleaned up some of the file structure.