Re-organize for use with stow