File reorg
README fixes