some more sweeping changes as I move from old file structure to new file structure