Simplify source layout