Modify the structure, add helpers utils