reorganization. then prepare for next features