restructure in prep for integration