Move singleuser-base into a different directory