Reorganizing packages. This will hopefully not be the mess it once was.