Moved and removed some old stuff.