Moving Cost Tables up to share with other targets