Changed Package structure to reflect endpoint structure and prevent
conflicts