A massive project structure refactoring