Much better directory layout.