Renamed and moved a ton of stuff around.