rearrange file layouts.
remove unnecessary code.