Reduce nestedness
Fix README