project structure improved