Remove top level folder and rename main harvester to follow _harvester convention