Cleaning up package for proper structure. Removing pieces that should be in the consuming project.