Move user definition into user.sls. Add services to top.sls. Remove salt.sls