Included package-info's and done some restructuring