Fix missing subdirs
And add some README updates