reorganize sources
code refactoring & adc