Final project initial restructure.