clean up junk
put files in one place