Restructure to prepare for GNU Stow