Updated project layout to reflect changes in harp api