Refactored paths to be more consistent.