Add users, remove some boilerplate scaffolding, regenerate distribution