Restructured the whole project.