organisation: move wrongly categorised drawing functions and mark some addresses as obsolete