More changes so that everything is packaged nicely and includes headers