Remove Common folder.  Replace by src