Get working User2 rest api
refactor file structure