Reorganized a lot.
Removed old stuff.