Restructing projects and repo