Restructure groups and packages management