Clean up fs layout somewhat
Add some more information about the basic design