Changed file paths to represent everything better.