Minor fixes
Add organization editing, removed useless class