Extracted common files to a separate common-package