Rename machine-base => base