Reorganize for installation with stow