Continue ~/usr refactor.