adding common dir
Merge commit '87fe967'