Starting to restructure the entire project.