Deleted and moved a bunch of stuff