Add {{user.active}} to User Provider component
Reorganise user components
Rename tables