Revert "organization model"

This reverts commit 033d1c4b57e3cabbb0212ca4d476601c2b1946b9.