move underscore to common dir