More sensible file layout.