Restructure Project 2