Reorganize some basic functinality.