commmon: re-organize, update, clean-up