more cleanup of path layout, more work on ai