update readme; reorganize