Simplify layout for portability to Windows