Cleaned up and fixed some file paths.