Move to folder to prep for merge w/ analyzer