re-organize: move and rename