Restructure of project.