many changes

many changes in the project structure