Move shared resources to Common library
Remove duplications