Adjust to new conventions and add initial system level setup.