Better file layout. Better test running, I hope.