Removed old classes and moved things around a bit.