Begin moving files over to harp structure