Restructure and add projects