reorganize files and update README