Changes to make the projects compile with the new directory changes