Reorganize load-path stuff