Use new home directory structure