Refactors galore, 1.6.4 isn't dead yet!!

Making everything one download to make everyone's life easier coming
next.