rearrange directories
move output directory
clearning out old cruft
mroe cleanup
fix assert warnings