Add some tests. Change directory layout.