Refactored some paths.