[FEATURE] Team refactored
[FEATURE] Organisation Users Sorting