Moving users into their own file