clean up
refactor the dir structure for the various scripts