Server

- converted to immediately executing function
Orgs

- added org view
- clean up and improvements