I think that everything in the depthview subdirectory should be removed before this is merged.