Restructure of projects