Tidy source tree, update README