Refactor to split users into its own file