Project layout simplification