Changed all project structure