Removed some crap. Reorganized some crap.