rearrange packages, clean out 2 files, prep for "Event Creator"