More reorganization and readme updates