Moving organization info to separate model