Cleanup, reorganization

I finally know what I'm going to do this with this.