More cleanup (put all the things into harp dir)