Cleaned up some file names, etc.