Reorganized a bit in core, added groups and status