Craig - rework paths
Craig - merge