Reorganized everything into packages.

It was starting to get really messy....