Wing's fudge

Took unused stuff
Clean packages and renamed them