Renamed, removed and moved things around.