Changed paths/packages and renamed interfaces