Cleanup README and spec organization