adjusted to new sdk dir struc