Restructure and set up project