Updated readme. Tidy dir. More tests (broken)