Restructure projects