restructure users controller