cleanup

moving things into right place