Reorganized project a bit more to allow creation of multiple packages.