resutructured the project