modify general code

the code is reorganized...