Put our code more properly into its own package