Refactor SS.Common, remove .Common namespace