Simplify project structure