Package and naming clean up