Fix READMEs

* reorder packages 
* Fix merge leftover