Change repo structure; add some test data