Moved files to sw/harris directory and did clean up