Cleaned up some of the file structure. No meaningful changes.