added groups and cleaned repos a bit