reorganize source files
1.7 partially done