Restructured project groups and layers