Removed dedicated models for computing and user conf, and merged it in the models themselves. Added support for the groups. Minor fixes and improvements.
