Directory cleanup
Directory cleanup
Fixup readme some