reorganization and refactoring
update README